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

4174 Commits

Author SHA1 Message Date
Amith Yamasani
67920f0639 am b02771ef: Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev 
* commit 'b02771eff35cccf03202e4b8e27a44681a5f7570':
  Reduce jank in security lock selection by finishing on return
 2012-10-24 22:48:41 -07:00
Amith Yamasani
b02771eff3 Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev 2012-10-24 22:47:18 -07:00
Michael Jurka
d4362b7d35 Merge "Adding ability to add multiple keyguard widgets" into jb-mr1-lockscreen-dev 2012-10-24 18:28:28 -07:00
Michael Jurka
89a30ffc63 Adding ability to add multiple keyguard widgets 
Bug: 7381803

Change-Id: I099f47a5cc43199635fed9ad2c4d03d79004e4f4
 2012-10-24 17:44:36 -07:00
Amith Yamasani
c666c65fab Reduce jank in security lock selection by finishing on return 
Earlier the finish of the chooser was happening before the pattern/pin chooser
was started, resulting in two transitions.

This change defers the finish to after returning from the other activity. There
is still sometimes a very small glitch on the way back, but much smaller than
the current problem.

Bug: 7342594

Change-Id: I5f4f4393b841ce31dc7236074381283155ebddbd
 2012-10-24 13:57:01 -07:00
Amith Yamasani
5faee7d432 am d525470d: am 039a365f: am 5749ce09: Merge "Use given name instead of full name for the initial population of User name." into jb-mr1-dev 
* commit 'd525470d4b7a290b7a55ee244d47f8e486cfe72c':
  Use given name instead of full name for the initial population of User name.
 2012-10-24 13:35:02 -07:00
Amith Yamasani
5749ce0903 Merge "Use given name instead of full name for the initial population of User name." into jb-mr1-dev 2012-10-24 13:26:39 -07:00
Amith Yamasani
8d40fac706 Use given name instead of full name for the initial population of User name. 
Bug: 7406217

Change-Id: I5006039ef146369f569445d0fcbaf82fd163343e
 2012-10-24 10:30:51 -07:00
Amith Yamasani
6e158a91f6 am efc9458b: am 4f5555ab: am b80b8bb2: Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev 
* commit 'efc9458b46cdbab7abe5df169d83a09582e8e6cd':
  Fixes an AIOOBE when device admin enforces a small timeout for screen lock
 2012-10-22 18:03:49 -07:00
Amith Yamasani
b80b8bb253 Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev 2012-10-22 17:56:54 -07:00
Amith Yamasani
64516a191f Fixes an AIOOBE when device admin enforces a small timeout for screen lock 
Bug: 7378871

If the timeout choices are empty, set an empty summary.

Change-Id: I20dbe61af56f9c41337a7c284580511322e5a45e
 2012-10-22 16:38:02 -07:00
Guang Zhu
4b8b98d81f am 8f2a9c00: am 6a07244f: am a023f4f6: Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev 
* commit '8f2a9c0043081f0008bfadc50bb7cbc010a2b3cb':
  Prevent sync state changes when user is a monkey
 2012-10-22 11:58:22 -07:00
Guang Zhu
a023f4f640 Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev 2012-10-22 11:50:39 -07:00
Guang Zhu
167ba2af93 Prevent sync state changes when user is a monkey 
Bug: 7385019

Change-Id: Icf305683e57b83b3260f2587ae0a3d1a6dc3c21d
 2012-10-22 11:37:31 -07:00
Russell Brenner
3ee25f2eec am 86a52bec: am 5c412204: am 56a166e9: Added info about why Wi-Fi is required 
* commit '86a52bec4b0134e540cc5c546da4e88dc2d62487':
  Added info about why Wi-Fi is required
 2012-10-21 08:09:59 -07:00
Russell Brenner
56a166e9e3 Added info about why Wi-Fi is required 
Added a new optional textview to wifi settings, informing that wifi
is required during setup. For use on Nakasi 3G.

Bug: 7383934
Change-Id: I231472438e61ccddedc1e680a362f90738d64a2d
 2012-10-19 18:55:14 -07:00
John Spurlock
e32a008ef8 am 9055dd74: am 76f99688: am d983e1d1: Settings: Use new shared dream setting defaults. 
* commit '9055dd74f4ac42e422de941259d9f9c437ef9eca':
  Settings: Use new shared dream setting defaults.
 2012-10-19 11:11:18 -07:00
John Spurlock
d983e1d1a5 Settings: Use new shared dream setting defaults. 
Bug:7373284
Change-Id: I12d00b45d0bada5207af3a7bda906370e7a87413
 2012-10-19 11:27:22 -04:00
Jeff Sharkey
531e67847e am 049ccb55: am 0d4fd237: am 5a740ab1: Merge "More migration to Global settings." into jb-mr1-dev 
* commit '049ccb55361de3ef41b01875569b341c4f06d1db':
  More migration to Global settings.
 2012-10-18 23:31:07 -07:00
Jeff Sharkey
5a740ab1b9 Merge "More migration to Global settings." into jb-mr1-dev 2012-10-18 23:23:08 -07:00
Romain Guy
547d5a4c00 am b8b34ba9: am 6dc2c7a5: am 8b982465: Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev 
* commit 'b8b34ba9f5e1fb545276dc95ff57859e26188265':
  Control OpenGL traces from Developer Options in Settings
 2012-10-18 18:17:08 -07:00
Romain Guy
8b98246559 Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev 2012-10-18 18:09:49 -07:00
Romain Guy
025cafcfa1 Control OpenGL traces from Developer Options in Settings 
This change adds a new entry to the developer options screen in
settings that lets you choose what OpenGL traces you want.

Change-Id: Ie789fa20dbbabee1e509b697106072464e9f9d2b
 2012-10-18 17:37:43 -07:00
Jeff Sharkey
860eceba2c More migration to Global settings. 
Bug: 7375796
Change-Id: I43079368c32e91e8bb75b00377cd57d1766f15d4
 2012-10-18 15:38:42 -07:00
Zhihai Xu
10307b99dc am ecb7f618: am 3e1e454b: am 8346107d: Merge "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev 
* commit 'ecb7f618576300e5d729c1aab2938169634f0d33':
  bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)
 2012-10-18 15:15:49 -07:00
Zhihai Xu
8346107d25 Merge "bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev 2012-10-18 15:07:49 -07:00
Zhihai Xu
ec16c0ae42 bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet) 
The root cause is normally when change the airplane mode, the bluetooth setting UI
 will not be foreground. No listener is setup for bluetooth setting UI when it is
 in background. So the onCheckedChanged won't be called and mLocalAdapter.setBluetoothEnabled
 won't be called. But for manta, airplane mode setting and bluetooth setting UI both
 will show on the foreground due to bigger screen size. When we turn ariplane mode on,
 bluetooth manager service will disable bluetooth without changing the persist bluetooth setting.
 But bluetooth setting UI will listen to the bluetooth state change intent, it will receive
 bluetooth state turn-off intent then it will call mSwitch.setChecked(false) in handleStateChanged,
 which cause checked status changed from true to false to trigger the listener (onCheckedChanged)
 being called. The listener will call mAdapter.disable() which will call mManagerService.disable(true)
 to change bluetooth persist state to OFF. So when we turn back airplane more to OFF,
 due to the bluetooth persist state is OFF, we won't turn back bluetooth to ON.
 Don't need to consider thread synchronization, because everything is running on the main thread.

bug 7366814

Change-Id: I138d1904df6cb17c7828295caa51a7d80abf99f2
 2012-10-18 13:03:10 -07:00
Daniel Sandler
e18099d769 am 6749fb88: am 260e34b2: am deb5a843: Merge "More descriptive summary for "Sleep Mode" pref." into jb-mr1-dev 
* commit '6749fb88efaacf1e1de23fd170d0797562101aee':
  More descriptive summary for "Sleep Mode" pref.
 2012-10-18 10:31:36 -07:00
Daniel Sandler
deb5a843c9 Merge "More descriptive summary for "Sleep Mode" pref." into jb-mr1-dev 2012-10-18 10:24:42 -07:00
Daniel Sandler
c825bc8e17 More descriptive summary for "Sleep Mode" pref. 
It will either show "Off" or the name of the selected dream.

Also, move "When to sleep" out onto the visible part of the
action bar if there's room, making it much easier to discover.

Bug: 7320701
Change-Id: I1d4e2c17b764b8ee054dbb17c23f559d735e3450
 2012-10-18 11:38:28 -04:00
John Huang
e324f43d6a am 5a8b0b82: am c58479ec: am 50023033: Merge "Revert "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)"" into jb-mr1-dev 
* commit '5a8b0b8276701ee230ad6f02c8474dd05a67c595':
  Revert "bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)"
 2012-10-17 20:00:52 -07:00
Irfan Sheriff
4aaebfe591 Revert "bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)" 
This reverts commit 0b21b3d725.
Bug: 7366814

Change-Id: I0992e9ca1a6e36ebc3a717137a6c494835fad712
 2012-10-17 18:45:42 -07:00
Zhihai Xu
4d71d5d4cf am 933bef3d: am 8d08bc53: am 6ec44ff0: Merge "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev 
* commit '933bef3db03d25ba430139ef9bdb12369a70661b':
  bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)
 2012-10-17 16:38:48 -07:00
Zhihai Xu
6ec44ff064 Merge "bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev 2012-10-17 16:32:57 -07:00
Amith Yamasani
780136f202 am fca149f2: am c45f88ea: am 7a1c4cdf: Fix check for multiple users 
* commit 'fca149f25859a902506cd449ed73fe54c0fad740':
  Fix check for multiple users
 2012-10-17 14:13:47 -07:00
Zhihai Xu
0b21b3d725 bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet) 
The root cause is normally when change the airplane mode, the bluetooth setting UI
 will not be foreground. No listener is setup for bluetooth setting UI when it is
 in background. So the onCheckedChanged won't be called and mLocalAdapter.setBluetoothEnabled
 won't be called. But for manta, airplane mode setting and bluetooth setting UI both
 will show on the foreground due to bigger screen size. When we turn ariplane mode on,
 bluetooth manager service will disable bluetooth without changing the persist bluetooth setting.
 But bluetooth setting UI will listen to the bluetooth state change intent, it will receive
 bluetooth state turn-off intent then it will call mSwitch.setChecked(false) in handleStateChanged,
 which cause checked status changed from true to false to trigger the listener (onCheckedChanged)
 being called. The listener will call mAdapter.disable() which will call mManagerService.disable(true)
 to change bluetooth persist state to OFF. So when we turn back airplane more to OFF,
 due to the bluetooth persist state is OFF, we won't turn back bluetooth to ON.

bug 7366814
Change-Id: I07d4a2dfe03fc6775cfeabb28cd3a0cc1fded44e
 2012-10-17 13:57:43 -07:00
Amith Yamasani
7a1c4cdfae Fix check for multiple users 
Bug: 7365839

Remove the Uninstall for all users option if less than 2 users on the device.

Change-Id: I5d2d853e05e1d505b67f8b83b1d5ea7f9c6e7215
 2012-10-17 13:36:21 -07:00
Romain Guy
b86c2e54a2 am fd0a3d08: am a1090b41: am 891185a4: Merge "New developer setting: force 4x MSAA" into jb-mr1-dev 
* commit 'fd0a3d08238c6c924e702266da58e3d8f512a94c':
  New developer setting: force 4x MSAA
 2012-10-16 09:49:10 -07:00
Romain Guy
6a9a3e765a New developer setting: force 4x MSAA 
Change-Id: I443b97ad8adc9f461aa140069f208f83f19f8c52
 2012-10-15 19:22:57 -07:00
Dianne Hackborn
c76ceba9ca am 31d866e1: am a4eabfde: am bc3cab99: Merge "Fix issue #7330867: Cannot disable a built-in app if you\'ve downloaded updates" into jb-mr1-dev 
* commit '31d866e1c612d2391e8b279addd052ac779c503b':
  Fix issue #7330867: Cannot disable a built-in app if you've downloaded updates
 2012-10-14 11:13:20 -07:00
Dianne Hackborn
bc3cab99e3 Merge "Fix issue #7330867: Cannot disable a built-in app if you've downloaded updates" into jb-mr1-dev 2012-10-14 11:07:46 -07:00
Adam Powell
e19424f29d am fcf460eb: am cc7f6e92: am a5f6762a: Show the overflow in the right place for keyguard settings 
* commit 'fcf460eb874953fd663711fe7d6164f700d181ae':
  Show the overflow in the right place for keyguard settings
 2012-10-13 01:32:22 -07:00
Adam Powell
a5f6762adf Show the overflow in the right place for keyguard settings 
Change-Id: Ie8b2c8acf97736041bf09a64c0f1d77f80350f4c
 2012-10-13 01:20:28 -07:00
Dianne Hackborn
9072d9efc6 Fix issue #7330867: Cannot disable a built-in app if you've downloaded updates 
Change-Id: Ie9dfe4a9195e4583bead8066807e4bba8274801f
 2012-10-12 19:20:09 -07:00
Jim Miller
6b3bb24fc0 am 0b0f1ea2: am 17963414: am afc0036e: Merge "Disable security widgets for now" into jb-mr1-dev 
* commit '0b0f1ea2c25e7c68e60ab64e2adeb2cca24173a7':
  Disable security widgets for now
 2012-10-12 13:26:42 -07:00
Jim Miller
afc0036e27 Merge "Disable security widgets for now" into jb-mr1-dev 2012-10-12 13:20:16 -07:00
Amith Yamasani
b417ffc768 am a6b3ecbe: am 85cd2c56: am 9b8055b3: Merge "Fix a regression in exiting the activity on picking a locale" into jb-mr1-dev 
* commit 'a6b3ecbebfa2d5de7525184747116edaea1c148f':
  Fix a regression in exiting the activity on picking a locale
 2012-10-12 11:10:31 -07:00
Amith Yamasani
9b8055b337 Merge "Fix a regression in exiting the activity on picking a locale" into jb-mr1-dev 2012-10-11 18:25:41 -07:00
Amith Yamasani
8d7148c4d5 am 33e8e04d: am 552bebe0: am 35bbbc6c: Merge "Launch account addition activity from Settings instead of from AccountManager" into jb-mr1-dev 
* commit '33e8e04d844713f59ca0193bb93f8ae9bedbe72c':
  Launch account addition activity from Settings instead of from AccountManager
 2012-10-11 17:17:57 -07:00
Dianne Hackborn
59fde8ef9d am 2ab44c07: am 4d35affe: am 85badb09: Merge "Fix issue #7328934: change threshold of developer options countdown toast" into jb-mr1-dev 
* commit '2ab44c0711743ab64bd55208b7fc97bfa954a053':
  Fix issue #7328934: change threshold of developer options countdown toast
 2012-10-11 17:17:55 -07:00