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

9161 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
b8b34ba9f5 am 6dc2c7a5: am 8b982465: Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev 
* commit '6dc2c7a535f960870f8bf644410574eec2650e88':
  Control OpenGL traces from Developer Options in Settings
 2012-10-18 18:14:38 -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
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
ecb7f61857 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 '3e1e454b208caaf270eee490fe86cf828e3b6900':
  bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)
 2012-10-18 15:12:43 -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
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
6749fb88ef am 260e34b2: am deb5a843: Merge "More descriptive summary for "Sleep Mode" pref." into jb-mr1-dev 
* commit '260e34b2d57cf793d684b8aafeaee9d8e4b44c87':
  More descriptive summary for "Sleep Mode" pref.
 2012-10-18 10:28:56 -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
f05a1c1784 am 625f84a2: am 37cdfbd6: 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 '625f84a277659e8294dd484f7758cc87253a1b17':
  Fix bug #7356946 The Data Usage app details contain titles that are not RTL align. ( Hebrew Only )
 2012-10-18 10:20:04 -07:00
Fabrice Di Meglio
625f84a277 am 37cdfbd6: 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 '37cdfbd6974fd74ce5e12ca97e5974a781325f54':
  Fix bug #7356946 The Data Usage app details contain titles that are not RTL align. ( Hebrew Only )
 2012-10-18 10:17:36 -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
Baligh Uddin
7da8a52d94 am 17d6b95f: (-s ours) am 825b7012: am f6d4b290: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '17d6b95fa8cf5ca37f988e3c4fa8ccff83a6fe5a':
  Import translations. DO NOT MERGE
 2012-10-17 22:42:12 -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
17d6b95fa8 am 825b7012: am f6d4b290: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '825b70129ac3a26e6912fa6c2553a4a7913557ec':
  Import translations. DO NOT MERGE
 2012-10-17 22:39:29 -07:00
Baligh Uddin
2a91b82b80 am b41c3f61: (-s ours) am 342bb26b: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'b41c3f6113745844e9bc47875b4c84d877546f60':
  Import translations. DO NOT MERGE
 2012-10-17 22:39:20 -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
b41c3f6113 am 342bb26b: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '342bb26b0d06ded2d08f1d5956b332fdc544e5dd':
  Import translations. DO NOT MERGE
 2012-10-17 22:36:31 -07:00
Baligh Uddin
af33080e78 Merge "Import translations. DO NOT MERGE" 2012-10-17 22:35:43 -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
b872110345 Import translations. DO NOT MERGE 
Change-Id: I57b92279446eac4157a52adafd6ceb5a3657da84
Auto-generated-cl: translation import
 2012-10-17 22:24:47 -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
017214ca86 am 3ce0c0bd: am 326489ee: am c30a6712: Merge "Show regulatory info within a ScrollView" into jb-mr1-dev 
* commit '3ce0c0bdaf1854a7c612dd3322f2324270c4354e':
  Show regulatory info within a ScrollView
 2012-10-17 21:57:13 -07:00
Brian Muramatsu
3ce0c0bdaf am 326489ee: am c30a6712: Merge "Show regulatory info within a ScrollView" into jb-mr1-dev 
* commit '326489ee0ceaba2f12c1aeb2d81d6d1efdc80a00':
  Show regulatory info within a ScrollView
 2012-10-17 21:55:26 -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
Brian Muramatsu
326489ee0c 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:32 -07:00
Brian Muramatsu
c30a6712f2 Merge "Show regulatory info within a ScrollView" into jb-mr1-dev 2012-10-17 21:51:28 -07: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
John Huang
5a8b0b8276 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 'c58479ec8aaf3354afc6ed4b6c24f2f5019e3dfb':
  Revert "bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)"
 2012-10-17 19:57:48 -07:00
John Huang
c58479ec8a 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 '5002303399341d7d442856a30df9080b896d7c55':
  Revert "bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)"
 2012-10-17 19:55:48 -07:00
John Huang
ff11f09af0 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 '5002303399341d7d442856a30df9080b896d7c55':
  Revert "bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)"
 2012-10-17 19:55:32 -07:00
John Huang
5002303399 Merge "Revert "bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)"" into jb-mr1-dev 2012-10-17 19:53:47 -07:00
Casey Burkhardt
63c81b15bf am c17358f5: am ca879740: am 91ecf27a: Correcting content description in Wifi network selection activity. Bug: 7362208 
* commit 'c17358f5ddc3d3dffdcd2a4bccae8b5ed21532ea':
  Correcting content description in Wifi network selection activity. Bug: 7362208
 2012-10-17 19:33:30 -07:00
Casey Burkhardt
c17358f5dd am ca879740: am 91ecf27a: Correcting content description in Wifi network selection activity. Bug: 7362208 
* commit 'ca879740509a4d44f3e0ac2f70ac5dfcb8b8af08':
  Correcting content description in Wifi network selection activity. Bug: 7362208
 2012-10-17 19:31:25 -07:00
Casey Burkhardt
ca87974050 am 91ecf27a: Correcting content description in Wifi network selection activity. Bug: 7362208 
* commit '91ecf27ab6713fa18be509c9ec4d143789a0ca5f':
  Correcting content description in Wifi network selection activity. Bug: 7362208
 2012-10-17 19:29:33 -07:00
Casey Burkhardt
7367bb2a31 am 91ecf27a: Correcting content description in Wifi network selection activity. Bug: 7362208 
* commit '91ecf27ab6713fa18be509c9ec4d143789a0ca5f':
  Correcting content description in Wifi network selection activity. Bug: 7362208
 2012-10-17 19:29:08 -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