PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,774 Commits 1 Branch 0 Tags
58a551575915a73ffbb1b20066bf8c39c515aa1d
Commit Graph

8774 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Baligh Uddin
2d9629557d am a7acb166: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'a7acb166b282e3aa178eb1f6d1c8ece877d2c64d':
  Import translations. DO NOT MERGE
 2012-10-22 14:01:54 -07:00
Baligh Uddin
5fb549bf5f am a7acb166: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'a7acb166b282e3aa178eb1f6d1c8ece877d2c64d':
  Import translations. DO NOT MERGE
 2012-10-22 14:01:14 -07:00
Baligh Uddin
350ea07ca8 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 2012-10-22 13:59:29 -07:00
Baligh Uddin
a7acb166b2 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-22 13:58:38 -07:00
Baligh Uddin
aeeba258e1 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-22 13:58:21 -07:00
Baligh Uddin
697ca010af Import translations. DO NOT MERGE 
Change-Id: I8c6dd26846136e2c70a725bddde0bf26e44b1509
Auto-generated-cl: translation import
 2012-10-22 12:11:35 -07:00
Baligh Uddin
3a7fd50408 Import translations. DO NOT MERGE 
Change-Id: Ia49c8378454cc2af782efffce6aa70c60568f3fd
Auto-generated-cl: translation import
 2012-10-22 12:09:26 -07:00
Baligh Uddin
4a3bed0cf9 Import translations. DO NOT MERGE 
Change-Id: I94a7973ca3611509deb3847b4bc211196f12ca30
Auto-generated-cl: translation import
 2012-10-22 12:07:22 -07:00
Guang Zhu
6a07244fa8 am a023f4f6: Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev 
* commit 'a023f4f6404027c3525af2cc48535a208e33b1d8':
  Prevent sync state changes when user is a monkey
 2012-10-22 11:53:23 -07:00
Guang Zhu
09a728a2a9 am a023f4f6: Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev 
* commit 'a023f4f6404027c3525af2cc48535a208e33b1d8':
  Prevent sync state changes when user is a monkey
 2012-10-22 11:53: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
The Android Automerger
8e9678eb6f merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-22 06:59:29 -07:00
Russell Brenner
f012a9dd14 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-21 13:34:38 -07:00
Russell Brenner
3fd05c8853 am 56a166e9: Added info about why Wi-Fi is required 
* commit '56a166e9e3cac96246bd724ceea96846fc9e41e1':
  Added info about why Wi-Fi is required
 2012-10-21 08:05:17 -07:00
Russell Brenner
5c412204a6 am 56a166e9: Added info about why Wi-Fi is required 
* commit '56a166e9e3cac96246bd724ceea96846fc9e41e1':
  Added info about why Wi-Fi is required
 2012-10-21 08:05:12 -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
The Android Automerger
e2d92fe6f0 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-19 15:46:29 -07:00
John Spurlock
5586afe0eb am d983e1d1: Settings: Use new shared dream setting defaults. 
* commit 'd983e1d1a52af2ab85d10f1a15c8387a6b6a3ba9':
  Settings: Use new shared dream setting defaults.
 2012-10-19 11:06:26 -07:00
John Spurlock
76f99688cf am d983e1d1: Settings: Use new shared dream setting defaults. 
* commit 'd983e1d1a52af2ab85d10f1a15c8387a6b6a3ba9':
  Settings: Use new shared dream setting defaults.
 2012-10-19 11:05:49 -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
The Android Automerger
66646dcf10 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-19 07:00:05 -07:00
Jeff Sharkey
0d4fd237ea am 5a740ab1: Merge "More migration to Global settings." into jb-mr1-dev 
* commit '5a740ab1b9d5757d684f6a798932f0b4729cc9a7':
  More migration to Global settings.
 2012-10-18 23:26:08 -07:00
Jeff Sharkey
9d0fbd728e am 5a740ab1: Merge "More migration to Global settings." into jb-mr1-dev 
* commit '5a740ab1b9d5757d684f6a798932f0b4729cc9a7':
  More migration to Global settings.
 2012-10-18 23:25:23 -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
6dc2c7a535 am 8b982465: Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev 
* commit '8b98246559c7422e507458a63c8dfc2783bd0afc':
  Control OpenGL traces from Developer Options in Settings
 2012-10-18 18:12:03 -07:00
Romain Guy
7caa7515f8 am 8b982465: Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev 
* commit '8b98246559c7422e507458a63c8dfc2783bd0afc':
  Control OpenGL traces from Developer Options in Settings
 2012-10-18 18:12:00 -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
3e1e454b20 am 8346107d: Merge "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev 
* commit '8346107d25a05580fa98adaaff9d28c025d3faed':
  bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)
 2012-10-18 15:11:03 -07:00
Zhihai Xu
ac8cfd0b9c am 8346107d: Merge "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev 
* commit '8346107d25a05580fa98adaaff9d28c025d3faed':
  bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)
 2012-10-18 15:09:45 -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
8b6036c3fb am deb5a843: Merge "More descriptive summary for "Sleep Mode" pref." into jb-mr1-dev 
* commit 'deb5a843c9feb39d8ea564347a97417b34a5e9a1':
  More descriptive summary for "Sleep Mode" pref.
 2012-10-18 10:27:04 -07:00
Daniel Sandler
260e34b2d5 am deb5a843: Merge "More descriptive summary for "Sleep Mode" pref." into jb-mr1-dev 
* commit 'deb5a843c9feb39d8ea564347a97417b34a5e9a1':
  More descriptive summary for "Sleep Mode" pref.
 2012-10-18 10:27:04 -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
Fabrice Di Meglio
37cdfbd697 am c14d1134: Merge "Fix bug #7356946 The Data Usage app details contain titles that are not RTL align. ( Hebrew Only )" into jb-mr1-dev 
* commit 'c14d1134a06324ece490f7ace3337c692b2ea542':
  Fix bug #7356946 The Data Usage app details contain titles that are not RTL align. ( Hebrew Only )
 2012-10-18 10:14:40 -07:00
Fabrice Di Meglio
17edbf38d7 am c14d1134: Merge "Fix bug #7356946 The Data Usage app details contain titles that are not RTL align. ( Hebrew Only )" into jb-mr1-dev 
* commit 'c14d1134a06324ece490f7ace3337c692b2ea542':
  Fix bug #7356946 The Data Usage app details contain titles that are not RTL align. ( Hebrew Only )
 2012-10-18 10:14:35 -07:00
Fabrice Di Meglio
c14d1134a0 Merge "Fix bug #7356946 The Data Usage app details contain titles that are not RTL align. ( Hebrew Only )" into jb-mr1-dev 2012-10-18 10:13:18 -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
The Android Automerger
4fed5a3a8e merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-18 07:00:03 -07:00
Baligh Uddin
67a54eaa81 am f6d4b290: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'f6d4b29088eb9c12f144828f905cee64bd4e0358':
  Import translations. DO NOT MERGE
 2012-10-17 22:40:07 -07:00
Baligh Uddin
825b70129a am f6d4b290: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'f6d4b29088eb9c12f144828f905cee64bd4e0358':
  Import translations. DO NOT MERGE
 2012-10-17 22:37:34 -07:00
Baligh Uddin
f6d4b29088 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-17 22:35:17 -07:00
Baligh Uddin
342bb26b0d Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-17 22:34:44 -07:00
Baligh Uddin
076140897f Import translations. DO NOT MERGE 
Change-Id: Ia0b02f13e3dd75052d20687605be5856f635aa67
Auto-generated-cl: translation import
 2012-10-17 22:19:25 -07:00
Baligh Uddin
fed707d180 Import translations. DO NOT MERGE 
Change-Id: Ifa1c716ce5a5b1c16ee6b45bb37181f63f13e4a9
Auto-generated-cl: translation import
 2012-10-17 22:17:36 -07:00
Brian Muramatsu
0bfd02b05e am c30a6712: Merge "Show regulatory info within a ScrollView" into jb-mr1-dev 
* commit 'c30a6712f266b9d4cf0c68b4a708ae6ae95911f4':
  Show regulatory info within a ScrollView
 2012-10-17 21:53:36 -07:00