PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,290 Commits 1 Branch 0 Tags
a6c51f3d0b1b43aa3e27bd98639f0ad3acf22ecc
Commit Graph

9290 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
5ddbefbe7b am 64e327e1: am 1cadd481: Merge "Disable USB debugging checkbox and backup password for secondary users" into jb-mr1.1-dev 
* commit '64e327e1ef441491e700270e24299912aea8d6fe':
  Disable USB debugging checkbox and backup password for secondary users
 2012-11-30 16:46:06 -08:00
Amith Yamasani
64e327e1ef am 1cadd481: Merge "Disable USB debugging checkbox and backup password for secondary users" into jb-mr1.1-dev 
* commit '1cadd481bc34b466809b944a0f8490767cf92787':
  Disable USB debugging checkbox and backup password for secondary users
 2012-11-30 16:44:27 -08:00
Amith Yamasani
1cadd481bc Merge "Disable USB debugging checkbox and backup password for secondary users" into jb-mr1.1-dev 2012-11-30 16:42:05 -08:00
Jeff Sharkey
97d07fa3ae Push scrollbars to screen edges. 
Push scrollbar to screen edges on custom ListView and ScrollViews to
match Preferences framework behavior.

Bug: 7633165
Change-Id: Ideecd0e243c7de7bf977caef2b1585e707a00ca4
 2012-11-30 16:15:09 -08:00
Jeff Sharkey
6f8cd76870 Fix text alignment and simplify layouts. 
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
 2012-11-30 14:26:47 -08:00
Amith Yamasani
48d000ee2e Disable USB debugging checkbox and backup password for secondary users 
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
 2012-11-30 14:20:04 -08:00
Jeff Sharkey
8f28cd5d75 Fix incorrectly inverted text color. 
Bug: 7632947
Change-Id: I2eb8c4c24bda5b08215204330c30431bf6d0fc27
 2012-11-30 12:32:58 -08:00
Daniel Sandler
8a8a265b88 am aea3fbde: am 77ec6de1: Merge "Add android.settings.DREAM_SETTINGS for Daydream settings." into jb-mr1.1-dev 
* commit 'aea3fbde280107738281f568cb1f4d860f50abfc':
  Add android.settings.DREAM_SETTINGS for Daydream settings.
 2012-11-30 11:02:23 -08:00
Daniel Sandler
aea3fbde28 am 77ec6de1: Merge "Add android.settings.DREAM_SETTINGS for Daydream settings." into jb-mr1.1-dev 
* commit '77ec6de156c52edbda95894a609cc43dcd29e454':
  Add android.settings.DREAM_SETTINGS for Daydream settings.
 2012-11-30 11:00:17 -08:00
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
a835f66ec7 am b71b78a4: am 6c269982: Merge "Use plurals for the developer steps countdown" into jb-mr1.1-dev 
* commit 'b71b78a4d4e8c4b7a7514abd692c72898cd665ce':
  Use plurals for the developer steps countdown
 2012-11-30 10:20:38 -08:00
Evan Charlton
b71b78a4d4 am 6c269982: Merge "Use plurals for the developer steps countdown" into jb-mr1.1-dev 
* commit '6c269982f3b188b5d7f70fcb670ab191b39b2689':
  Use plurals for the developer steps countdown
 2012-11-30 10:18:27 -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
df0c7e7601 am 918c847d: am 43635081: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit '918c847dacbc52af3c1f438318bc1bb3ce9ceed8':
  Import translations. DO NOT MERGE
 2012-11-29 21:27:44 -08:00
Baligh Uddin
918c847dac am 43635081: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit '436350817f550819a3bf514c9ea74e12a1fbb2e8':
  Import translations. DO NOT MERGE
 2012-11-29 21:25:46 -08:00
Baligh Uddin
e5187da9cc am 4d9ba011: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '4d9ba0114a4c5e3b54be65bee667ce3c3f06415e':
  Import translations. DO NOT MERGE
 2012-11-29 21:25:14 -08:00
Baligh Uddin
436350817f Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-11-29 21:23:45 -08:00
Baligh Uddin
4d9ba0114a Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-11-29 21:23:28 -08:00
Jeff Sharkey
129605270a am 90dbd693: am 39b7bd8c: Merge "Use uniform font size for APNs and timezones. DO NOT MERGE." into jb-mr1.1-dev 
* commit '90dbd6936c72e2cc6a9ab4699c5af00edeb4cfd6':
  Use uniform font size for APNs and timezones. DO NOT MERGE.
 2012-11-29 18:02:09 -08:00
Jeff Sharkey
2f12147e91 am a04497d7: am 5d376860: Merge "Avoid split action bar when it only has one item. DO NOT MERGE." into jb-mr1.1-dev 
* commit 'a04497d70cc4f422cfa36c5be2f35a6170d5725a':
  Avoid split action bar when it only has one item.  DO NOT MERGE.
 2012-11-29 18:02:08 -08:00
Jeff Sharkey
90dbd6936c am 39b7bd8c: Merge "Use uniform font size for APNs and timezones. DO NOT MERGE." into jb-mr1.1-dev 
* commit '39b7bd8cbcd4413e8ab4dae5caa2b34f38530c95':
  Use uniform font size for APNs and timezones. DO NOT MERGE.
 2012-11-29 18:00:37 -08:00
Jeff Sharkey
a04497d70c am 5d376860: Merge "Avoid split action bar when it only has one item. DO NOT MERGE." into jb-mr1.1-dev 
* commit '5d376860e9c76c4026b824dfd4b4d295541f4fef':
  Avoid split action bar when it only has one item.  DO NOT MERGE.
 2012-11-29 18:00:36 -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
fc6f304a9f am 48b6e21b: am 6e8644bc: Add string resource removed by previous commit. 
* commit '48b6e21b75a5da10e9840aa88f2789956483de87':
  Add string resource removed by previous commit.
 2012-11-29 16:19:15 -08:00
Jake Hamby
48b6e21b75 am 6e8644bc: Add string resource removed by previous commit. 
* commit '6e8644bcca75700757977be9fab1ffc501325c3e':
  Add string resource removed by previous commit.
 2012-11-29 16:17:08 -08:00
The Android Open Source Project
af8e106049 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I5f455c4d385b0d72a9539104b6390abb94042277
 2012-11-29 15:41:44 -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
26a67fd181 am c5190506: am 0206284a: Merge "Fix Bluetooth enable dialog to match Android style guide." into jb-mr1.1-dev 
* commit 'c51905067793a3f18c94df79eb15472cbb58322f':
  Fix Bluetooth enable dialog to match Android style guide.
 2012-11-29 14:28:50 -08:00
Dianne Hackborn
8afda9efce am ac4bfa60: am af604801: Merge "Be quiet!" into jb-mr1.1-dev 
* commit 'ac4bfa607d8a1e3c78de25dec740637cd5906a8d':
  Be quiet!
 2012-11-29 14:26:34 -08:00
Adam Cohen
94cdb26c40 am e38d6277: am 9067d57a: Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev 
* commit 'e38d6277c8355cca7239deed6a6df75f852b164d':
  Making sure keyguard and homescreen only display eligible widgets (issue 7550090)
 2012-11-29 14:26:25 -08:00
Jake Hamby
c519050677 am 0206284a: Merge "Fix Bluetooth enable dialog to match Android style guide." into jb-mr1.1-dev 
* commit '0206284a661b3370a175bb8c28c005aa6b45d9d3':
  Fix Bluetooth enable dialog to match Android style guide.
 2012-11-29 14:15:39 -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
Baligh Uddin
9768cfb7df Import translations. DO NOT MERGE 
Change-Id: I42cd557944ae8f5f2da42603328eee04f5e6b25c
Auto-generated-cl: translation import
 2012-11-29 11:04:26 -08:00
The Android Automerger
f7f6e2c4bb merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-29 07:09:57 -08:00
Dianne Hackborn
ac4bfa607d am af604801: Merge "Be quiet!" into jb-mr1.1-dev 
* commit 'af6048010773606acf3a88df6954e1f7f3597a9f':
  Be quiet!
 2012-11-28 18:20:21 -08:00
Adam Cohen
e38d6277c8 am 9067d57a: Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev 
* commit '9067d57a88e7bc43b7d1d0217b4b740f972bde47':
  Making sure keyguard and homescreen only display eligible widgets (issue 7550090)
 2012-11-28 18:18:26 -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
Jeff Sharkey
81df8360c9 am 59ee3889: Merge "Settings: fix storage measurement for device without emulated sdcard" 
* commit '59ee3889088eb40ab6d8b0f4f9f11f51a89c0f76':
  Settings: fix storage measurement for device without emulated sdcard
 2012-11-28 13:04:58 -08:00
Jeff Sharkey
59ee388908 Merge "Settings: fix storage measurement for device without emulated sdcard" 2012-11-28 10:23:31 -08:00
The Android Open Source Project
2fb2c487c1 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I81ef334240c928353194c517a94bf5e052b54322
 2012-11-28 09:47:52 -08:00
Shuhrat Dehkanov
96577681a2 Grey out settings icon when it is in disabled state 
If engine is not active, its settings icon is disabled in
Settings > Language & input > Text-to-speech output screen.
Currently, settings icons for all TTS engines are shown at
the same opacity. This fix dims settings icons of not-selected
engines.
Make sure that more than one TTS engine are installed on the
target, for e.g., Google Text-to-speech Engine and Classic
Text To Speech Engine (SVOX Classic TTS).

Additionally, since setAlpha() is used in multiple places within
Settings package, moved DISABLED_ALPHA declaration to Utils.java
in order to have single point of reference.

Change-Id: Ifa7de79814a2f4a4aa021cd8621cbfab41655680
Signed-off-by: Shuhrat Dehkanov <uzbmaster@gmail.com>
 2012-11-28 23:45:35 +09:00
John Spurlock
fb50353037 am 28c116f0: am fc4be385: Merge "Update a few dream setting strings to ease translation." into jb-mr1.1-dev 
* commit '28c116f0c22c8a31a4053fa72a73eaa0f4cbf30e':
  Update a few dream setting strings to ease translation.
 2012-11-28 06:33:53 -08:00
John Spurlock
28c116f0c2 am fc4be385: Merge "Update a few dream setting strings to ease translation." into jb-mr1.1-dev 
* commit 'fc4be3856f6e1cd47da742a2a30b322979a9ebd0':
  Update a few dream setting strings to ease translation.
 2012-11-28 06:31:50 -08:00