Jean-Baptiste Queru
6fb425e280
am eefa61ed: Merge "Settings: Use ICS alert drawable"
...
* commit 'eefa61ed2e8583f659e868f3057f195d7cb2bb11':
Settings: Use ICS alert drawable
2012-08-13 12:02:26 -07:00
Jean-Baptiste Queru
eefa61ed2e
Merge "Settings: Use ICS alert drawable"
2012-08-13 11:53:46 -07:00
Jean-Baptiste Queru
7526636406
am 5d72b272: Merge "Add support for SE Android to the Settings app."
...
* commit '5d72b2726797374e402943182d8132045ed32d3a':
Add support for SE Android to the Settings app.
2012-08-08 14:04:11 -07:00
Michael Jurka
3d43f9c8aa
am ca511a81: Fix appwidget bind dialog
...
* commit 'ca511a8115962be7f598deb20aa47793db6d06f7':
Fix appwidget bind dialog
2012-08-02 22:29:23 -07:00
Michael Jurka
ca511a8115
Fix appwidget bind dialog
...
Bug: 6926529
Change-Id: I19327a6346b6e7da61a49a983b3373058db21f12
2012-08-02 18:36:42 -07:00
Amith Yamasani
2d018a8b0d
am 07841668: Merge "Move Google-apps specific location settings to a Google package" into jb-dev
...
* commit '078416689807e49c8b6750b9e3cc8a0e9ca3a2a1':
Move Google-apps specific location settings to a Google package
2012-07-26 16:07:19 -07:00
Amith Yamasani
8442db24a1
Move Google-apps specific location settings to a Google package
...
Bug: 6882764
This removes the Google specific checkbox and adds a master toggle
for location providers which turns both providers on/off when
toggled.
Change-Id: I2a7af0953902bfd6f4b221725dc2d838bb3d0ce4
2012-07-26 14:28:07 -07:00
Stephen Smalley
b4e84f34e0
Add support for SE Android to the Settings app.
...
Display SELinux status (disabled, permissive, enforcing) under About phone.
Change-Id: I69529fb7a3adfe31eccb16d79740fc4952ff5e68
2012-07-20 15:41:29 -07:00
Wink Saville
9ad4a89877
Use telephony-common - DO NOT MERGE
...
Change-Id: Ic95136fd5934afdd53a08bfd640d40add67fdb44
2012-07-17 12:23:26 -07:00
Dianne Hackborn
b2a16b9202
am ea819b07: Merge "Implement issue #6819955 : Add button to take bug report." into jb-dev
...
* commit 'ea819b07fa9e17fcd17e0384626ee6a47bc0ecd6':
Implement issue #6819955 : Add button to take bug report.
2012-07-13 17:06:00 -07:00
Dianne Hackborn
fd8c315573
Implement issue #6819955 : Add button to take bug report.
...
Change-Id: Ic615180121d4db52f92aa8264d95d790de5fff9d
2012-07-13 16:10:16 -07:00
John Wang
e8b2530260
am b0b45c02: Display FCC id for LTE in Settings.
...
* commit 'b0b45c02ec73c87f78a8358a7e98747bd96ec103':
Display FCC id for LTE in Settings.
2012-07-12 14:29:13 -07:00
John Wang
b0b45c02ec
Display FCC id for LTE in Settings.
...
If ro.ril.fccid is set by RIL, display it at Settings -> About Tablet -> FCC Equipment ID.
bug:4965501
Change-Id: I920ab071bf1997c4fbf3ce81f88e24f512d004c3
2012-07-11 16:50:32 -07:00
Wink Saville
5543404ae0
Use telephony-common
...
Change-Id: Ic95136fd5934afdd53a08bfd640d40add67fdb44
2012-07-11 15:08:15 -07:00
Irfan Sheriff
7c8363eb11
am d80ff0a4: Merge "wifi: update text displayed during hotspot on/off"
...
* commit 'd80ff0a4d615bd6f037483bf9dc2b10887d9507f':
wifi: update text displayed during hotspot on/off
2012-07-03 12:18:33 -07:00
Irfan Sheriff
d80ff0a4d6
Merge "wifi: update text displayed during hotspot on/off"
2012-07-03 11:30:05 -07:00
Dianne Hackborn
d601be8f94
am 313ab172: Fix issue #6761130 : Clearing app data in settings does not clear app\'s USB storage
...
* commit '313ab1727014d535790bc89afdcf725ff936e5b4':
Fix issue #6761130 : Clearing app data in settings does not clear app's USB storage
2012-06-29 15:43:34 -07:00
Dianne Hackborn
313ab17270
Fix issue #6761130 : Clearing app data in settings does not clear app's USB storage
...
The installed app details was not correctly distinguishing between cache and
normal data on external storage. The cache files on external storage are now
correctly shown in the cache section, since those are what get deleted when
you hit the clear cache button.
Change-Id: Id98bdb7fb5202d6a092fe5a772638eeb6aed2b47
2012-06-29 15:01:23 -07:00
Brian Muramatsu
1f1b9abd00
am beb3d8b1: Merge "Fix Settings NPE" into jb-dev
...
* commit 'beb3d8b1e06f26c20adc4d4db7a08ac507ad6ab0':
Fix Settings NPE
2012-06-28 16:56:29 -07:00
Brian Muramatsu
c28af52e59
Fix Settings NPE
...
Labels for account types can be null which causes a NPE to occur in
Settings. If the label is null, don't bother adding an account
header. If we don't do this, then it would blow up when trying to
sort the headers anyway, so this change will fix the crash.
Bug 6727947
Change-Id: I284d7204b6d21c8d1b0a36e18ecae2c2361eeb84
2012-06-28 14:25:14 -07:00
Jake Hamby
8f12b1287f
am f59dd9d6: Merge "Add menu item to Settings to go to Cell Broadcast settings." into jb-dev
...
* commit 'f59dd9d67e269a81c684ecd641e514aba8d2330a':
Add menu item to Settings to go to Cell Broadcast settings.
2012-06-25 16:21:18 -07:00
Jake Hamby
ef57ed71bf
Add menu item to Settings to go to Cell Broadcast settings.
...
Add menu item to Settings when "config_cellBroadcastAppLinks"
config option is set to true to jump to the Cell Broadcast app
settings activity. This enables the Cell Broadcast launcher
icon to be removed, while still allowing access to the app
(by adding a similar menu item to the MMS app) and its settings
activity (this settings link).
The menu item will not be added if the CellBroadcastReceiver
package is disabled or not installed.
Bug: 6709985
Change-Id: If3a3016ceea70704790964c0b712c31cb38f7b62
2012-06-25 13:20:45 -07:00
Amith Yamasani
66b0ad5793
am 9938ac8a: Merge "Fix incorrect updating of headers in Settings" into jb-dev
...
* commit '9938ac8a6e1885b2cd7f35fd6c63e2b04a84d36c':
Fix incorrect updating of headers in Settings
2012-06-20 15:48:24 -07:00
Amith Yamasani
9938ac8a6e
Merge "Fix incorrect updating of headers in Settings" into jb-dev
2012-06-20 15:45:05 -07:00
Amith Yamasani
ea7b28c2a1
Fix incorrect updating of headers in Settings
...
Settings was overriding the header list in PreferenceActivity and
maintaining its own. In the case where Settings activity is restored
from saved state, the header lists went out of sync and couldn't
be updated anymore.
This makes use of a new private method in PreferenceActivity to
retrieve the header list object so that they stay in sync and can
be updated.
Also make sure to invalidate headers on resume, so that the latest
account types are loaded.
Bug: 6685701
Change-Id: I76ed1e1579a70fb5abfcea417d7e981907bdc02c
2012-06-20 13:51:40 -07:00
Christopher Tate
1b4a9b4107
am 5739d4fe: Merge "Use string resources instead of literals for backup password confirmations" into jb-dev
...
* commit '5739d4fe02c7ca4d3d939ec4f21bc9de42b8676f':
Use string resources instead of literals for backup password confirmations
2012-06-19 16:34:01 -07:00
Christopher Tate
5739d4fe02
Merge "Use string resources instead of literals for backup password confirmations" into jb-dev
2012-06-19 16:31:11 -07:00
Christopher Tate
2d6497d2d1
Use string resources instead of literals for backup password confirmations
...
Localizability is good. Bug 6683158
Change-Id: I205e4a09f5137e18d4085fcc041fae86f26ab188
2012-06-19 16:22:55 -07:00
Amith Yamasani
f62df931fa
am 8e1981cc: Merge "Show full summary for network location sercice even for wifi-only devices" into jb-dev
...
* commit '8e1981ccd314bf3e41601314e78cc9626a4299af':
Show full summary for network location sercice even for wifi-only devices
2012-06-19 16:01:50 -07:00
Amith Yamasani
1270eb5e43
Show full summary for network location sercice even for wifi-only devices
...
Bug: 6694051
Change-Id: Ic2446aa640bc2688fd74885eeb55f179c51e7691
2012-06-19 10:53:49 -07:00
Dianne Hackborn
2027328c7b
am 4d8dac07: Merge "Implement issue #6633077 : Improve permissions display for..." into jb-dev
...
* commit '4d8dac0792ec7994f9f4cbf2648cf8f3185876ca':
Implement issue #6633077 : Improve permissions display for...
2012-06-18 10:33:07 -07:00
Dianne Hackborn
fe5a72dae2
am ed99a81e: Merge "Fix issue #6664140 : Time to lock should work even Stay awake..." into jb-dev
...
* commit 'ed99a81e1595c25d7070866ee0c2aa1d94103955':
Fix issue #6664140 : Time to lock should work even Stay awake...
2012-06-18 10:33:00 -07:00
Dianne Hackborn
4d8dac0792
Merge "Implement issue #6633077 : Improve permissions display for..." into jb-dev
2012-06-15 17:53:40 -07:00
Dianne Hackborn
f34a8d7517
Fix issue #6664140 : Time to lock should work even Stay awake...
...
...in Developer options is on
Disable the stay awake while on option in settings if a lock limit
is being enforced.
Bug: 6664140
Change-Id: I8da1b8c734ceef10662d33392609c35e645315c3
2012-06-15 17:07:14 -07:00
Dianne Hackborn
e458832c76
Implement issue #6633077 : Improve permissions display for...
...
...inherited permissions from shared UIDs
Bug: 6633077
Change-Id: I91917339e83b79a3dfcfcb70a68d571c9a7f7e14
2012-06-15 11:00:17 -07:00
Amith Yamasani
e5147e4933
am 5b7a8204: Merge "Show only the language if there\'s only one locale for the language." into jb-dev
...
* commit '5b7a8204d875c901782ff482b68fde8da7a0081f':
Show only the language if there's only one locale for the language.
2012-06-13 15:24:12 -07:00
Amith Yamasani
140b6f5234
Show only the language if there's only one locale for the language.
...
If the system has only one instance of that language, then only show the language
without the country name.
Bug: 6522572
Change-Id: I1e99182b1c669b200090f6c360bb902376b63ab0
2012-06-13 12:56:21 -07:00
Jeff Sharkey
c35b51f3c7
am cd4428ce: Storage banner when device in low disk state.
...
* commit 'cd4428ce2c03fd355a3093fad6553636da9cef9b':
Storage banner when device in low disk state.
2012-06-12 18:54:49 -07:00
Jeff Sharkey
cd4428ce2c
Storage banner when device in low disk state.
...
Bug: 6576409
Change-Id: I25f71935e312bf6efa832d10c22e3edbdc18f4fb
2012-06-12 18:41:51 -07:00
Jean-Baptiste Queru
093cf6094c
Swap start/stop of SettingsObserver and InputDeviceListener
...
Change-Id: Ic6b7bab860f71889a6ec476ccab1e83d2efd0e64
2012-06-12 15:43:17 -07:00
Jean-Baptiste Queru
89d702ac68
resolved conflicts for merge of 051f46d7 to jb-dev-plus-aosp
...
Change-Id: I73165a3d77318cbb0271e0d5c64cc49caad8f693
2012-06-12 15:22:22 -07:00
Russell Brenner
8b16c219f0
am 3f9ec9f1: Merge "Disable notification alerts in Settings for SUW" into jb-dev
...
* commit '3f9ec9f1c2744664ae637b9fbce99c115c60a429':
Disable notification alerts in Settings for SUW
2012-06-12 13:56:38 -07:00
Russell Brenner
3f9ec9f1c2
Merge "Disable notification alerts in Settings for SUW" into jb-dev
2012-06-12 13:53:31 -07:00
Jean-Baptiste Queru
051f46d798
Merge "Unregister ContentObserver in InputMethodAndLanguageSettings class"
2012-06-12 13:50:36 -07:00
Jeff Brown
77a6080aeb
am b5858bbd: Fix NPE in rotation lock content observer.
...
* commit 'b5858bbdc363e21bf87ac5643822ec9e57956c52':
Fix NPE in rotation lock content observer.
2012-06-12 13:16:04 -07:00
Jeff Brown
b5858bbdc3
Fix NPE in rotation lock content observer.
...
Bug: 6647846
Change-Id: Idd17edb78f451807eabdd988017b68ce02b9c75f
2012-06-12 12:57:11 -07:00
Shuhrat Dehkanov
9bcc607049
Unregister ContentObserver in InputMethodAndLanguageSettings class
...
A content observer (SettingsObserver) is registered when
InputMethodAndLanguageSettings is created, but it is never unregistered.
Added resume() and pause() methods to SettingsObserver inner class
to register/unregister the content observer when InputMethodAndLanguageSettings
is resumed/paused.
Change-Id: I6d4cc2625a5fd8435967d930f46e8fe86eda4714
Signed-off-by: Shuhrat Dehkanov <uzbmaster@gmail.com >
2012-06-13 03:20:38 +09:00
Russell Brenner
58d6ffc5f5
Disable notification alerts in Settings for SUW
...
When activated by Setup Wizard, disable notification alerts and other
status bar flags as also done by Setup Wizard and GSF.
Bug: 6645469
Change-Id: I43ef5c2a5fa3f53434a1aaa968de50d91b0d78ce
2012-06-11 17:50:44 -07:00
Amith Yamasani
f595a2b884
am 450c4c86: Merge "Exit to Settings when removing the only account for a type." into jb-dev
...
* commit '450c4c86ca6583abc27520174d0f51b8f171f4a3':
Exit to Settings when removing the only account for a type.
2012-06-08 15:30:58 -07:00
Amith Yamasani
450c4c86ca
Merge "Exit to Settings when removing the only account for a type." into jb-dev
2012-06-08 15:27:32 -07:00