summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* am 68066a78: am e2d893e2: Merge "Makes the add button for new APNs appear in ↵Elliott Hughes2012-12-081-1/+2
|\ | | | | | | | | | | | | the action bar." * commit '68066a78352ea6b147767e84a5481764f0054f2b': Makes the add button for new APNs appear in the action bar.
| * am e2d893e2: Merge "Makes the add button for new APNs appear in the action bar."Elliott Hughes2012-12-081-1/+2
| |\ | | | | | | | | | | | | * commit 'e2d893e2af36e4ede8d1ec074912563ae6ecf7ef': Makes the add button for new APNs appear in the action bar.
| | * Merge "Makes the add button for new APNs appear in the action bar."Elliott Hughes2012-12-081-1/+2
| | |\
| | | * Makes the add button for new APNs appear in the action bar.Manuel R. Ciosici2012-09-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The APN add button (a plus sign) now appears in the action bar if possible. The APN list interface is now more consistent with the WiFi list interface. Previously the user had to press the 'Menu' hardware button or the three dot button on the screen in order to reveal the actions. Change-Id: Iae622054ec080ba4775c22223dd75a865c83fc27 Signed-off-by: Manuel R. Ciosici <manuelrciosici@gmail.com>
* | | | Merge "Don't do the developer options countdown for secondary users."Amith Yamasani2012-12-071-0/+3
|\ \ \ \
| * | | | Don't do the developer options countdown for secondary users.Amith Yamasani2012-12-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7469031 Change-Id: I794cb8b67a9221cc4fcd2dd6208777648c818fe0
* | | | | am 4e0391a7: am 49c4de7f: Merge "Format change at "Mobile network type" value"Wink Saville2012-12-071-2/+5
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit '4e0391a733a3c5ba0c23c00c165aeb580426cee1': Format change at "Mobile network type" value
| * | | | am 49c4de7f: Merge "Format change at "Mobile network type" value"Wink Saville2012-12-071-2/+5
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit '49c4de7f139a1a3a60dc8f7e72acae710dba506f': Format change at "Mobile network type" value
| | * | | Format change at "Mobile network type" valueAkira Oshimi2012-12-061-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove "network type Number" from "mobile network type" value at "About Phone > Status". For example value "UNKNOWN:0" became "UNKNOWN" (if value is "UNKNOWN", the word is localized) The number ":0" did not add much value to the user. Change-Id: Iee29fa2ab42f2d6eab5d9dbd6f647087ee382648
* | | | | am b722b80d: am b7d94e74: am aeb57eda: Pass the locale code in the help url ↵Amith Yamasani2012-12-074-16/+146
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | | | | | | | | for help pages. * commit 'b722b80da8481a1570dbe4be89b8ed70daec6b41': Pass the locale code in the help url for help pages.
| * | | am b7d94e74: am aeb57eda: Pass the locale code in the help url for help pages.Amith Yamasani2012-12-074-16/+146
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'b7d94e74e1342c5583883e596fd268745a5a25b6': Pass the locale code in the help url for help pages.
| | * | | Pass the locale code in the help url for help pages.Amith Yamasani2012-12-064-16/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise the help will always be shown in English. Bug: 7564049 Change-Id: I94da36aa1ae5aabd118178866b7e570bb77add34
* | | | | am ac9bb0bd: am b39ab37a: am bc5d9271: Add latest area info broadcast to ↵Jake Hamby2012-12-051-5/+60
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Settings status screen. * commit 'ac9bb0bdc0c2ef42d259e555187061a0ea95c8f2': Add latest area info broadcast to Settings status screen.
| * | | | am b39ab37a: am bc5d9271: Add latest area info broadcast to Settings status ↵Jake Hamby2012-12-041-5/+60
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | screen. * commit 'b39ab37aa0e8be02a61c4245c181e523419ba703': Add latest area info broadcast to Settings status screen.
| | * | | Add latest area info broadcast to Settings status screen.Jake Hamby2012-12-041-5/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the SIM has a Brazilian country code, add an item to the status screen to show the most recently received area info cell broadcast, requested from CellBroadcastReceiver, which also broadcasts any updates to the area info. To read the area info broadcast or request it from CellBroadcastReceiver requires READ_PHONE_STATE permission. Bug: 7445881 Change-Id: I387e23ecd0802b212ecb3e44f900a3a7a4b27e76
* | | | | am 783d0e7d: am a5ca5158: am 49562681: Merge "Removing tutorial for choosing ↵Danielle Millett2012-11-302-123/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | a pattern as part of b/7459863" into jb-mr1.1-dev * commit '783d0e7d9d2dcc05a45b2c5ec7117f61f460642d': Removing tutorial for choosing a pattern as part of b/7459863
| * | | | am a5ca5158: am 49562681: Merge "Removing tutorial for choosing a pattern as ↵Danielle Millett2012-11-302-123/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | part of b/7459863" into jb-mr1.1-dev * commit 'a5ca51587d2fe3872f9e8610b5bd6e3e29bdefb1': Removing tutorial for choosing a pattern as part of b/7459863
| | * | | Merge "Removing tutorial for choosing a pattern as part of b/7459863" into ↵Danielle Millett2012-11-302-123/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | jb-mr1.1-dev
| | | * | | Removing tutorial for choosing a pattern as part of b/7459863Danielle Millett2012-11-212-123/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing the tutorial that is shown the first time a user sets up a pattern as their lock type. Change-Id: If73c936e41458af729740fe5b178b9452c7dd2c0
* | | | | | am f41b7643: am 3f5c8ede: am 5e337eda: Merge "Push scrollbars to screen ↵Jeff Sharkey2012-11-308-15/+69
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | edges." into jb-mr1.1-dev * commit 'f41b76430d584733dcfa9a2386bf0c379d04b0ed': Push scrollbars to screen edges.
| * | | | | am 3f5c8ede: am 5e337eda: Merge "Push scrollbars to screen edges." into ↵Jeff Sharkey2012-11-308-15/+69
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1.1-dev * commit '3f5c8ede376ecd0ea5610414a2f99191931ae77b': Push scrollbars to screen edges.
| | * | | | Merge "Push scrollbars to screen edges." into jb-mr1.1-devJeff Sharkey2012-11-308-15/+69
| | |\ \ \ \
| | | * | | | Push scrollbars to screen edges.Jeff Sharkey2012-11-308-15/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Push scrollbar to screen edges on custom ListView and ScrollViews to match Preferences framework behavior. Bug: 7633165 Change-Id: Ideecd0e243c7de7bf977caef2b1585e707a00ca4
* | | | | | | am 1ed3d1c8: am 1d3dbecd: am b0f3f8db: Merge "Fix incorrectly inverted text ↵Jeff Sharkey2012-11-301-3/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | color." into jb-mr1.1-dev * commit '1ed3d1c820886732f293f0909a4dbfcb651deae4': Fix incorrectly inverted text color.
| * | | | | | am 1d3dbecd: am b0f3f8db: Merge "Fix incorrectly inverted text color." into ↵Jeff Sharkey2012-11-301-3/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1.1-dev * commit '1d3dbecd9c76e0475f77d5bb443cd06018513944': Fix incorrectly inverted text color.
| | * | | | | Merge "Fix incorrectly inverted text color." into jb-mr1.1-devJeff Sharkey2012-11-301-3/+0
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Fix incorrectly inverted text color.Jeff Sharkey2012-11-301-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7632947 Change-Id: I2eb8c4c24bda5b08215204330c30431bf6d0fc27
* | | | | | | am 5ddbefbe: am 64e327e1: am 1cadd481: Merge "Disable USB debugging checkbox ↵Amith Yamasani2012-11-301-0/+13
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and backup password for secondary users" into jb-mr1.1-dev * commit '5ddbefbe7b176be6c822d368d782cdc6d010b97c': Disable USB debugging checkbox and backup password for secondary users
| * | | | | | am 64e327e1: am 1cadd481: Merge "Disable USB debugging checkbox and backup ↵Amith Yamasani2012-11-301-0/+13
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | password for secondary users" into jb-mr1.1-dev * commit '64e327e1ef441491e700270e24299912aea8d6fe': Disable USB debugging checkbox and backup password for secondary users
| | * | | | | Merge "Disable USB debugging checkbox and backup password for secondary ↵Amith Yamasani2012-11-301-0/+13
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | users" into jb-mr1.1-dev
| | | * | | | | Disable USB debugging checkbox and backup password for secondary usersAmith Yamasani2012-11-301-0/+13
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents secondary users from turning on adb debugging, even if they find a way to launch developer options. Similarly, don't let them add or change the adb backup password. Bug: 7637920 Change-Id: I297f0c515a276ede6a7f12d2add72faec4eeb384
* | | | | | | am 8a8a265b: am aea3fbde: am 77ec6de1: Merge "Add ↵Daniel Sandler2012-11-301-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android.settings.DREAM_SETTINGS for Daydream settings." into jb-mr1.1-dev * commit '8a8a265b88bda03f0ccc221522e2f038aed9f1ff': Add android.settings.DREAM_SETTINGS for Daydream settings.
| * | | | | | am aea3fbde: am 77ec6de1: Merge "Add android.settings.DREAM_SETTINGS for ↵Daniel Sandler2012-11-301-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Daydream settings." into jb-mr1.1-dev * commit 'aea3fbde280107738281f568cb1f4d860f50abfc': Add android.settings.DREAM_SETTINGS for Daydream settings.
| | * | | | | Merge "Add android.settings.DREAM_SETTINGS for Daydream settings." into ↵Daniel Sandler2012-11-301-0/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1.1-dev
| | | * | | | | Add android.settings.DREAM_SETTINGS for Daydream settings.Daniel Sandler2012-11-271-0/+1
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7480927 Change-Id: I5777f7c4aec9ad7d7eb9f7eeb882d2342cb481c3
* | | | | | | am a835f66e: am b71b78a4: am 6c269982: Merge "Use plurals for the developer ↵Evan Charlton2012-11-301-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | steps countdown" into jb-mr1.1-dev * commit 'a835f66ec736b7c2cdf4ca433f70161ef2290359': Use plurals for the developer steps countdown
| * | | | | | am b71b78a4: am 6c269982: Merge "Use plurals for the developer steps ↵Evan Charlton2012-11-301-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | countdown" into jb-mr1.1-dev * commit 'b71b78a4d4e8c4b7a7514abd692c72898cd665ce': Use plurals for the developer steps countdown
| | * | | | | Merge "Use plurals for the developer steps countdown" into jb-mr1.1-devEvan Charlton2012-11-301-2/+2
| | |\ \ \ \ \
| | | * | | | | Use plurals for the developer steps countdownEvan Charlton2012-11-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When counting down how many steps are left before the user becomes a developer, use plurals so that "steps" becomes "step" correctly. Change-Id: I5dbe2c229c9e6ed0c45aaae8c303b23efc76f75d
| * | | | | | | am 90dbd693: am 39b7bd8c: Merge "Use uniform font size for APNs and ↵Jeff Sharkey2012-11-291-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timezones. DO NOT MERGE." into jb-mr1.1-dev * commit '90dbd6936c72e2cc6a9ab4699c5af00edeb4cfd6': Use uniform font size for APNs and timezones. DO NOT MERGE.
| | * | | | | | Use uniform font size for APNs and timezones. DO NOT MERGE.Jeff Sharkey2012-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also get rid of some orange highlight! Bug: 7632945 Change-Id: I6a4b59f4eef81b128d128f5a429fb96f6366843a
| * | | | | | | am a04497d7: am 5d376860: Merge "Avoid split action bar when it only has one ↵Jeff Sharkey2012-11-291-1/+5
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | item. DO NOT MERGE." into jb-mr1.1-dev * commit 'a04497d70cc4f422cfa36c5be2f35a6170d5725a': Avoid split action bar when it only has one item. DO NOT MERGE.
| | * | | | | | Avoid split action bar when it only has one item. DO NOT MERGE.Jeff Sharkey2012-11-291-1/+5
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7632944 Change-Id: I055564b4f8d2a3fc97346e13e1d8818196a8f988
* | | | | | | Fix radio buttons when user cancel TTS engine changePrzemyslaw Szczepaniak2012-11-302-39/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When user decides to change tts engine, and if it's not system one, then he sees dialog warning about possibility of sending all kinds of data to the engine. If user chooses to not changes engine, radio button still sticks to the new position. This change delays all operations regarding changing current engine after user closes dialog. It also unsets the radio button if user chooses to cancel it. Bug: 7628362 Change-Id: I977abe71b3547f2545a971fc0d69179be6fafb44
* | | | | | | am 26a67fd1: am c5190506: am 0206284a: Merge "Fix Bluetooth enable dialog to ↵Jake Hamby2012-11-292-15/+7
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | match Android style guide." into jb-mr1.1-dev * commit '26a67fd181bc22d1d922195f32c4760ef8d7c578': Fix Bluetooth enable dialog to match Android style guide.
| * | | | | | am c5190506: am 0206284a: Merge "Fix Bluetooth enable dialog to match ↵Jake Hamby2012-11-292-15/+7
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android style guide." into jb-mr1.1-dev * commit 'c51905067793a3f18c94df79eb15472cbb58322f': Fix Bluetooth enable dialog to match Android style guide.
| | * | | | | Merge "Fix Bluetooth enable dialog to match Android style guide." into ↵Jake Hamby2012-11-292-15/+7
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1.1-dev
| | | * | | | | Fix Bluetooth enable dialog to match Android style guide.Jake Hamby2012-11-202-15/+7
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an app requests to enable Bluetooth and/or Bluetooth discovery, we show a dialog for user confirmation. Remove the dialog title, update the message text and button labels to be more descriptive, and use the standard dialog layout instead of a custom layout. Also fixes the button layout on the Bluetooth permission test app so that the "Discoverable" button doesn't wrap to two lines. Bug: 6001468 Change-Id: I731e2f31b4c822395fc3f83584a092550d9ae7d3
* | | | | | | am 8afda9ef: am ac4bfa60: am af604801: Merge "Be quiet!" into jb-mr1.1-devDianne Hackborn2012-11-291-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '8afda9efce141118425e2ee8b1dca7f2466cd525': Be quiet!
| * | | | | | am ac4bfa60: am af604801: Merge "Be quiet!" into jb-mr1.1-devDianne Hackborn2012-11-291-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'ac4bfa607d8a1e3c78de25dec740637cd5906a8d': Be quiet!