PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,498 Commits 1 Branch 0 Tags
77ec6de156c52edbda95894a609cc43dcd29e454
Commit Graph

8498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Sandler
77ec6de156 Merge "Add android.settings.DREAM_SETTINGS for Daydream settings." into jb-mr1.1-dev 2012-11-30 10:58:04 -08:00
Evan Charlton
6c269982f3 Merge "Use plurals for the developer steps countdown" into jb-mr1.1-dev 2012-11-30 10:15:25 -08:00
Baligh Uddin
436350817f Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-11-29 21:23:45 -08:00
Jeff Sharkey
39b7bd8cbc Merge "Use uniform font size for APNs and timezones. DO NOT MERGE." into jb-mr1.1-dev 2012-11-29 17:58:24 -08:00
Jeff Sharkey
5d376860e9 Merge "Avoid split action bar when it only has one item. DO NOT MERGE." into jb-mr1.1-dev 2012-11-29 17:58:19 -08:00
Jake Hamby
6e8644bcca Add string resource removed by previous commit. 
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
 2012-11-29 15:06:20 -08:00
Jeff Sharkey
4166ec39ec Use uniform font size for APNs and timezones. DO NOT MERGE. 
Also get rid of some orange highlight!

Bug: 7632945
Change-Id: I6a4b59f4eef81b128d128f5a429fb96f6366843a
 2012-11-29 14:50:11 -08:00
Jeff Sharkey
c2b43dbee8 Avoid split action bar when it only has one item. DO NOT MERGE. 
Bug: 7632944
Change-Id: I055564b4f8d2a3fc97346e13e1d8818196a8f988
 2012-11-29 14:50:02 -08:00
Jake Hamby
0206284a66 Merge "Fix Bluetooth enable dialog to match Android style guide." into jb-mr1.1-dev 2012-11-29 14:14:10 -08:00
Baligh Uddin
8092adf3a9 Import translations. DO NOT MERGE 
Change-Id: I89608bcb397958bf76472adb67ec1402f4a3ed5c
Auto-generated-cl: translation import
 2012-11-29 11:05:49 -08:00
Dianne Hackborn
af60480107 Merge "Be quiet!" into jb-mr1.1-dev 2012-11-28 18:18:00 -08:00
Dianne Hackborn
79d42bb622 Be quiet! 
Change-Id: Ifcce5bf4b2fca35fe50a2684983dc726534c3d0c
 2012-11-28 18:05:00 -08:00
Adam Cohen
9067d57a88 Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev 2012-11-28 17:47:19 -08:00
Adam Cohen
441588d221 Making sure keyguard and homescreen only display eligible widgets (issue 7550090) 
Change-Id: Ia1eb902618855e1a86a84c9090cdeefe5a404fd7
 2012-11-28 16:37:49 -08:00
John Spurlock
fc4be3856f Merge "Update a few dream setting strings to ease translation." into jb-mr1.1-dev 2012-11-28 06:30:29 -08:00
Daniel Sandler
7dee75c424 Add android.settings.DREAM_SETTINGS for Daydream settings. 
Bug: 7480927
Change-Id: I5777f7c4aec9ad7d7eb9f7eeb882d2342cb481c3
 2012-11-27 22:41:30 -05:00
Baligh Uddin
3236571f45 am 42db418f: Import translations. DO NOT MERGE 
* commit '42db418f963dfd200a75b518971c719215af352a':
  Import translations. DO NOT MERGE
 2012-11-27 14:23:27 -08:00
Baligh Uddin
1e9f8d6f54 Import translations. DO NOT MERGE 
Change-Id: Ibe10143bc63383ced22f10c1b7d35f90424dcb2f
Auto-generated-cl: translation import
 2012-11-27 14:22:35 -08:00
Baligh Uddin
42db418f96 Import translations. DO NOT MERGE 
Change-Id: I5b887c229653be7d975d36f96b2cdc66ebb498a9
Auto-generated-cl: translation import
 2012-11-27 14:21:30 -08:00
John Spurlock
8a9edfb1e3 Update a few dream setting strings to ease translation. 
Clarify that sleep = asleep and charging as we do in the ui.

Bug: 7564443
Change-Id: Id50938d6d4052fd4223e212125d10f4bfd0c6908
 2012-11-27 10:20:08 -05:00
Baligh Uddin
75e09c30a1 am 40129973: (-s ours) Import translations. DO NOT MERGE 
* commit '401299739295b2305707810bbae2e49eadac50ba':
  Import translations. DO NOT MERGE
 2012-11-26 09:35:59 -08:00
Baligh Uddin
16a4c2b2d3 Import translations. DO NOT MERGE 
Change-Id: Ibdf26abbd3f779772241bddcaa321ef7cec0d19b
Auto-generated-cl: translation import
 2012-11-22 23:19:57 -08:00
Baligh Uddin
4012997392 Import translations. DO NOT MERGE 
Change-Id: I21102fa6155368b3948a2606f9e30fde08b508b1
Auto-generated-cl: translation import
 2012-11-22 23:18:51 -08:00
Baligh Uddin
61b6c47e6c am e71a8772: Import translations. DO NOT MERGE 
* commit 'e71a8772bbc92a72e68484bb6c0aa2e3c0baa64d':
  Import translations. DO NOT MERGE
 2012-11-22 11:17:40 -08:00
Baligh Uddin
e71a8772bb Import translations. DO NOT MERGE 
Change-Id: I275d3bec8048e4da0d30b6deabc6966f6b0785fe
Auto-generated-cl: translation import
 2012-11-21 00:04:32 -08:00
Jake Hamby
95c1003f1c Fix Bluetooth enable dialog to match Android style guide. 
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
 2012-11-20 18:21:44 -08:00
Baligh Uddin
e9f89cfbf5 am 7ed1879f: Import translations. DO NOT MERGE 
* commit '7ed1879f283e4c92fe47ab345c5fdf405e95f233':
  Import translations. DO NOT MERGE
 2012-11-16 17:59:01 -08:00
Baligh Uddin
7ed1879f28 Import translations. DO NOT MERGE 
Change-Id: If48dc63e0112cc63e76b635047b38cde4b33ea06
Auto-generated-cl: translation import
 2012-11-16 15:51:59 -08:00
Eric Laurent
15c27bb40b Merge "fix dock audio enable dialog" into jb-mr1.1-dev 2012-11-16 14:05:00 -08:00
Amith Yamasani
6097726522 Merge "Use AlarmManager calls to set date/time, instead of SystemClock.setTime" into jb-mr1.1-dev 2012-11-16 10:43:04 -08:00
Amith Yamasani
5f05010438 Use AlarmManager calls to set date/time, instead of SystemClock.setTime 
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
 2012-11-15 14:44:41 -08:00
Vikram Aggarwal
f15f9d6765 Merge "Remove back button entirely when disabled" into jb-mr1.1-dev 2012-11-15 12:53:25 -08:00
Amith Yamasani
940f6f0c46 Merge "Fix a race condition when switching between settings panels" into jb-mr1.1-dev 2012-11-15 12:21:31 -08:00
Jeff Sharkey
733bd43798 Merge "Internationalize bytes and percentages." into jb-mr1.1-dev 2012-11-15 11:44:44 -08:00
Jeff Sharkey
6992d40776 Merge "Align "Make passwords visible" setting." into jb-mr1.1-dev 2012-11-15 11:44:38 -08:00
Baligh Uddin
3058022c16 am add9d21f: Import translations. DO NOT MERGE 
* commit 'add9d21f581272a957f8df4c9895d5c03515db13':
  Import translations. DO NOT MERGE
 2012-11-15 09:02:00 -08:00
Jeff Sharkey
8ef71dbcbc Align "Make passwords visible" setting. 
Bug: 7545894
Change-Id: I46113676c46055bd7468a0aa7289c9475e714232
 2012-11-14 17:00:12 -08:00
Jeff Sharkey
f707491cfb Internationalize bytes and percentages. 
Bug: 7545890
Change-Id: I634fafe9d61a2ebbf7a0cc56d8255457ee9fe1b2
 2012-11-14 16:56:11 -08:00
Amith Yamasani
5cdc937251 Fix a race condition when switching between settings panels 
The fragment was removed while the images were being loaded, so the
activity was null. This fix holds on to the Resources object.

Bug: 7490425
Change-Id: Ic2d8dd3c620fc34ce8255104001e17b39f828601
 2012-11-14 16:23:40 -08:00
Baligh Uddin
ec5c2a4603 Import translations. DO NOT MERGE 
Change-Id: I42acdae7131e469b7f01371d33abf9fa7c92cc1d
Auto-generated-cl: translation import
 2012-11-14 12:43:52 -08:00
Baligh Uddin
add9d21f58 Import translations. DO NOT MERGE 
Change-Id: I4d8e15ea1297b2ec3efd3decd24629e4b6360e76
Auto-generated-cl: translation import
 2012-11-14 12:41:58 -08:00
Eric Laurent
9f4afb0762 fix dock audio enable dialog 
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
 2012-11-12 14:29:17 -08:00
Baligh Uddin
42d9768420 am a0fbc220: Import translations. DO NOT MERGE 
* commit 'a0fbc220bb401f97103a0a22d14a45e33ca7a149':
  Import translations. DO NOT MERGE
 2012-11-09 16:15:33 -08:00
Vikram Aggarwal
bf459dafdc Remove back button entirely when disabled 
Bug: 7480506 Encryption screen shows back button
Change-Id: Iba2706fd6b61303178b472071f32d65bdf72e50d
 2012-11-09 14:40:22 -08:00
Baligh Uddin
a0fbc220bb Import translations. DO NOT MERGE 
Change-Id: I520c6d173124c8645fdfa2eb3db251f704c656c3
Auto-generated-cl: translation import
 2012-11-09 11:53:40 -08:00
The Android Open Source Project
15d91c6e82 Reconcile with jb-mr1-release - do not merge 
Change-Id: Iaa26de823282e7aba1ec495c04de885dd5267982
 2012-11-08 14:19:27 -08:00
The Android Automerger
79bf08d246 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-08 13:54:19 -08:00
Michael Jurka
ffffbf400b am d9609fc0: Fix jank after adding a widget for lock screen 
* commit 'd9609fc0a2be07e9100dbb83f3549dad1d9b3c51':
  Fix jank after adding a widget for lock screen
 2012-11-08 13:10:47 -08:00
Michael Jurka
caf13b22c0 am a108d9fc: Final tweaks to visuals of widget picker 
* commit 'a108d9fc0edd3b4f741fae595e35a246fbc700ff':
  Final tweaks to visuals of widget picker
 2012-11-08 13:10:46 -08:00
Baligh Uddin
0925698096 am c74ef2f2: am 7d6a0f9c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'c74ef2f28b1b095ecb3dea78ff8d277daec84f58':
 2012-11-07 18:29:07 -08:00