summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEBaligh Uddin2012-12-0449-80/+107
| | | | | Change-Id: I2ef0dc90375c2d1b8d341b2e747352d4a3313925 Auto-generated-cl: translation import
* Merge "Import translations. DO NOT MERGE" into jb-mr1.1-devBaligh Uddin2012-12-0449-944/+743
|\
| * Import translations. DO NOT MERGEBaligh Uddin2012-12-0349-944/+743
| | | | | | | | | | Change-Id: Id0c38bd59bc3019d70d4c8320019ce0cb0a697ef Auto-generated-cl: translation import
* | Better layouts for security screen setups as part of b/7459863Danielle Millett2012-11-308-145/+107
|/ | | | | | | | | | | | | | | The major change is that choose pattern and confirm pattern layouts no longer uses a split screen layout on tablets. The new layout closely mimics the layout for portrait. Other minor changes include: -Made the header font size for confirm pattern and choose pattern medium (this matches with face unlock changes). -Made the buttons on choose pattern for landscape phone side-by-side rather than above each other (to be consistent with face unlock). -Removed the black background from phone landscape confirm pattern since it's inconsistent with all the other layouts. Change-Id: I4473fe880ac471a3b5bc5399a454b10504589f87
* Merge "Removing tutorial for choosing a pattern as part of b/7459863" into ↵Danielle Millett2012-11-308-476/+1
|\ | | | | | | jb-mr1.1-dev
| * Removing tutorial for choosing a pattern as part of b/7459863Danielle Millett2012-11-218-476/+1
| | | | | | | | | | | | | | Removing the tutorial that is shown the first time a user sets up a pattern as their lock type. Change-Id: If73c936e41458af729740fe5b178b9452c7dd2c0
* | Merge "Push scrollbars to screen edges." into jb-mr1.1-devJeff Sharkey2012-11-3018-161/+221
|\ \
| * | Push scrollbars to screen edges.Jeff Sharkey2012-11-3018-161/+221
| | | | | | | | | | | | | | | | | | | | | | | | Push scrollbar to screen edges on custom ListView and ScrollViews to match Preferences framework behavior. Bug: 7633165 Change-Id: Ideecd0e243c7de7bf977caef2b1585e707a00ca4
* | | Merge "Fix text alignment and simplify layouts." into jb-mr1.1-devJeff Sharkey2012-11-304-127/+103
|\ \ \ | |/ /
| * | Fix text alignment and simplify layouts.Jeff Sharkey2012-11-304-127/+103
| | | | | | | | | | | | | | | | | | | | | | | | Fix Apps items to correctly base align text, and to align correctly in RTL mode. Use GridLayout to reduce layout complexity. Bug: 7633350, 7132595 Change-Id: Ic3563cfe408ebcdaef1ed693cc6b01b886d700ea
* | | 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
* | | 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
* | | | Merge "Add android.settings.DREAM_SETTINGS for Daydream settings." into ↵Daniel Sandler2012-11-302-0/+17
|\ \ \ \ | | | | | | | | | | | | | | | jb-mr1.1-dev
| * | | | Add android.settings.DREAM_SETTINGS for Daydream settings.Daniel Sandler2012-11-272-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7480927 Change-Id: I5777f7c4aec9ad7d7eb9f7eeb882d2342cb481c3
* | | | | Merge "Use plurals for the developer steps countdown" into jb-mr1.1-devEvan Charlton2012-11-302-3/+6
|\ \ \ \ \
| * | | | | Use plurals for the developer steps countdownEvan Charlton2012-11-072-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr1.1-devBaligh Uddin2012-11-291-1/+1
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I89608bcb397958bf76472adb67ec1402f4a3ed5c Auto-generated-cl: translation import
* | | | | | | Merge "Use uniform font size for APNs and timezones. DO NOT MERGE." into ↵Jeff Sharkey2012-11-292-11/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1.1-dev
| * | | | | | | Use uniform font size for APNs and timezones. DO NOT MERGE.Jeff Sharkey2012-11-292-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also get rid of some orange highlight! Bug: 7632945 Change-Id: I6a4b59f4eef81b128d128f5a429fb96f6366843a
* | | | | | | | Merge "Avoid split action bar when it only has one item. DO NOT MERGE." ↵Jeff Sharkey2012-11-292-4/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | into jb-mr1.1-dev
| * | | | | | | Avoid split action bar when it only has one item. DO NOT MERGE.Jeff Sharkey2012-11-292-4/+13
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7632944 Change-Id: I055564b4f8d2a3fc97346e13e1d8818196a8f988
* | | | | | | Add string resource removed by previous commit.Jake Hamby2012-11-291-0/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "bluetooth_permission_request" string resource was removed in a previous commit, but is still referenced by a manifest element. Add the original string resource to strings.xml. Bug: 7641406 Change-Id: I9a41760c74d8a243ff5e8d2d7938f81207e75173
* | | | | | Merge "Fix Bluetooth enable dialog to match Android style guide." into ↵Jake Hamby2012-11-296-70/+32
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | jb-mr1.1-dev
| * | | | | Fix Bluetooth enable dialog to match Android style guide.Jake Hamby2012-11-206-70/+32
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge "Be quiet!" into jb-mr1.1-devDianne Hackborn2012-11-281-1/+1
|\ \ \ \ \
| * | | | | Be quiet!Dianne Hackborn2012-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifcce5bf4b2fca35fe50a2684983dc726534c3d0c
* | | | | | Merge "Making sure keyguard and homescreen only display eligible widgets ↵Adam Cohen2012-11-281-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | (issue 7550090)" into jb-mr1.1-dev
| * | | | | Making sure keyguard and homescreen only display eligible widgets (issue ↵Adam Cohen2012-11-281-1/+2
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | 7550090) Change-Id: Ia1eb902618855e1a86a84c9090cdeefe5a404fd7
* | | | | Merge "Update a few dream setting strings to ease translation." into ↵John Spurlock2012-11-281-3/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | jb-mr1.1-dev
| * | | | Update a few dream setting strings to ease translation.John Spurlock2012-11-271-3/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Clarify that sleep = asleep and charging as we do in the ui. Bug: 7564443 Change-Id: Id50938d6d4052fd4223e212125d10f4bfd0c6908
* | | | am 42db418f: Import translations. DO NOT MERGEBaligh Uddin2012-11-270-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit '42db418f963dfd200a75b518971c719215af352a': Import translations. DO NOT MERGE
| * | | | Import translations. DO NOT MERGEBaligh Uddin2012-11-274-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5b887c229653be7d975d36f96b2cdc66ebb498a9 Auto-generated-cl: translation import
* | | | | Import translations. DO NOT MERGEBaligh Uddin2012-11-274-10/+10
| |/ / / |/| | | | | | | | | | | | | | | Change-Id: Ibe10143bc63383ced22f10c1b7d35f90424dcb2f Auto-generated-cl: translation import
* | | | am 40129973: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2012-11-260-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '401299739295b2305707810bbae2e49eadac50ba': Import translations. DO NOT MERGE
| * | | Import translations. DO NOT MERGEBaligh Uddin2012-11-2224-35/+35
| | | | | | | | | | | | | | | | | | | | Change-Id: I21102fa6155368b3948a2606f9e30fde08b508b1 Auto-generated-cl: translation import
* | | | Import translations. DO NOT MERGEBaligh Uddin2012-11-2249-84/+35
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibdf26abbd3f779772241bddcaa321ef7cec0d19b Auto-generated-cl: translation import
* | | | am e71a8772: Import translations. DO NOT MERGEBaligh Uddin2012-11-226-15/+15
|\ \ \ \ | |/ / / | | / / | |/ / |/| | * commit 'e71a8772bbc92a72e68484bb6c0aa2e3c0baa64d': Import translations. DO NOT MERGE
| * | Import translations. DO NOT MERGEBaligh Uddin2012-11-216-15/+15
| | | | | | | | | | | | | | | Change-Id: I275d3bec8048e4da0d30b6deabc6966f6b0785fe Auto-generated-cl: translation import
* | | am 7ed1879f: Import translations. DO NOT MERGEBaligh Uddin2012-11-163-39/+39
|\ \ \ | |/ / | | | | | | | | | * commit '7ed1879f283e4c92fe47ab345c5fdf405e95f233': Import translations. DO NOT MERGE
| * | Import translations. DO NOT MERGEBaligh Uddin2012-11-163-39/+39
| | | | | | | | | | | | | | | Change-Id: If48dc63e0112cc63e76b635047b38cde4b33ea06 Auto-generated-cl: translation import
* | | Merge "fix dock audio enable dialog" into jb-mr1.1-devEric Laurent2012-11-161-14/+23
|\ \ \
| * | | fix dock audio enable dialogEric Laurent2012-11-121-14/+23
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dock audio enable setting is not saved if the user dismisses the dialog without checking or unchecking the check box. The dialog is then displayed each time the device is docked until the user checks/unchecks the dialog or goes to sound settings to enable or disable dock audio. Bug 7518165. Change-Id: Ifbc6179e78b64b5b7577ac750acf9846525e47c5
* | | Merge "Use AlarmManager calls to set date/time, instead of ↵Amith Yamasani2012-11-163-8/+10
|\ \ \ | | | | | | | | | | | | SystemClock.setTime" into jb-mr1.1-dev
| * | | Use AlarmManager calls to set date/time, instead of SystemClock.setTimeAmith Yamasani2012-11-153-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way secondary users' settings app can request the system server to set the time. Alarm driver cannot be opened as a secondary user. Bug: 7459635 Change-Id: I1ae1630dc448021d35280a297c5d9960f8e8fc2e
* | | | Merge "Remove back button entirely when disabled" into jb-mr1.1-devVikram Aggarwal2012-11-151-10/+30
|\ \ \ \ | |/ / / |/| | |
| * | | Remove back button entirely when disabledVikram Aggarwal2012-11-091-10/+30
| | | | | | | | | | | | | | | | | | | | Bug: 7480506 Encryption screen shows back button Change-Id: Iba2706fd6b61303178b472071f32d65bdf72e50d
* | | | Merge "Fix a race condition when switching between settings panels" into ↵Amith Yamasani2012-11-151-3/+4
|\ \ \ \ | | | | | | | | | | | | | | | jb-mr1.1-dev
generated by cgit v1.1 at 2024-09-21 21:42:45 +0000