Fabrice Di Meglio
1aaa801e96
am de8c683f
: Merge "Fix bug #17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518)" into lmp-dev
...
* commit 'de8c683f99b8db7289289016cf5d33016eea9dcd':
Fix bug #17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518)
2014-09-02 17:22:54 +00:00
Fabrice Di Meglio
de8c683f99
Merge "Fix bug #17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518)" into lmp-dev
2014-09-02 17:13:42 +00:00
Dan Sandler
eee4ba73d2
am 3eac072b
: Merge "Switch to vibrate (or slash-bell) icon at ringer volume 0." into lmp-dev
...
* commit '3eac072b1ad963007211d1b13ebb6d0bb0fc24a6':
Switch to vibrate (or slash-bell) icon at ringer volume 0.
2014-09-02 15:40:18 +00:00
Dan Sandler
3eac072b1a
Merge "Switch to vibrate (or slash-bell) icon at ringer volume 0." into lmp-dev
2014-09-02 15:32:41 +00:00
PauloftheWest
b4460ad4e6
am d6cfeba9
: Merge "Updated Wifi Assistant to support RTL." into lmp-dev
...
* commit 'd6cfeba9f717fe043efc56d4bdf18a18e4bb9bff':
Updated Wifi Assistant to support RTL.
2014-09-02 13:12:01 +00:00
PauloftheWest
d6cfeba9f7
Merge "Updated Wifi Assistant to support RTL." into lmp-dev
2014-09-02 13:00:32 +00:00
Dan Sandler
cb9f35171d
Switch to vibrate (or slash-bell) icon at ringer volume 0.
...
Bug: 16900054
Change-Id: If94a18a7cac596c0f4c33421b642f96dcf0280fd
2014-09-02 12:48:51 +02:00
Baligh Uddin
c5d7005295
am 48d3f0fd
: (-s ours) Import translations. DO NOT MERGE
...
* commit '48d3f0fd612b740f92fc1c268c27eb9e55a2ef68':
Import translations. DO NOT MERGE
2014-09-01 21:44:29 +00:00
Baligh Uddin
48d3f0fd61
Import translations. DO NOT MERGE
...
Change-Id: Icb08251fbb0bc518bde18c174fedf464b0635486
Auto-generated-cl: translation import
2014-08-31 22:40:04 -07:00
Fabrice Di Meglio
72e07cf21c
Fix bug #17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518)
...
- do not care about getting a result for updating the Index as
there is no way to make it useful (the result will come later
when this is no more relevant)
- make a copy of the data to process and pass it to the AsyncTask
Change-Id: I6b8a08ecbe3d32cffac1314c03f682ebacfd64bf
2014-08-29 17:44:52 -07:00
Chris Wren
0ee29ed7c2
am 8007caa4
: Merge "Allow external packages to open the RedactionInsterstitial." into lmp-dev
...
* commit '8007caa43e0a97bc8b160544b81c3b6902cc37f3':
Allow external packages to open the RedactionInsterstitial.
2014-08-29 21:03:03 +00:00
Chris Wren
8007caa43e
Merge "Allow external packages to open the RedactionInsterstitial." into lmp-dev
2014-08-29 20:51:00 +00:00
Chris Wren
edcfcef00c
am a826cb52
: Merge "default to lock_screen_notifications_summary_show." into lmp-dev
...
* commit 'a826cb523f10efde7b1a68ba1b172777c34529fb':
default to lock_screen_notifications_summary_show.
2014-08-29 20:12:04 +00:00
Chris Wren
577f56d741
am 0680e0e7
: Merge "Don\'t allow users to set redaction on an insecure device." into lmp-dev
...
* commit '0680e0e7cd9ba8ac9c01c85a1ed8b75d95a30b6b':
Don't allow users to set redaction on an insecure device.
2014-08-29 20:12:03 +00:00
Andres Morales
7228243bd3
am ab61b0df
: Throw up ProgressDialog when erasing PST partition
...
* commit 'ab61b0df4af1a504e845c7008224ebadb5400ce9':
Throw up ProgressDialog when erasing PST partition
2014-08-29 20:12:02 +00:00
Chris Wren
a826cb523f
Merge "default to lock_screen_notifications_summary_show." into lmp-dev
2014-08-29 20:08:38 +00:00
Chris Wren
0680e0e7cd
Merge "Don't allow users to set redaction on an insecure device." into lmp-dev
2014-08-29 20:07:44 +00:00
Andres Morales
ab61b0df4a
Throw up ProgressDialog when erasing PST partition
...
This needs to be done here, but we should let the user know
we're doing work.
Bug: 17185720
Change-Id: I0d71ae38145e0649a430a8231b7e3f250c003ee8
2014-08-29 12:46:18 -07:00
Chris Wren
51ae332c3b
Allow external packages to open the RedactionInsterstitial.
...
Introduce RedactionSettingsStandalone, to supply the private setup
required by RedactionInsterstitial.
Bug: 15934899
Change-Id: Ie0bcc207c4f331def207e588bbad36b8986fe114
2014-08-29 15:17:37 -04:00
Chris Wren
30698293bf
default to lock_screen_notifications_summary_show.
...
When the user selects a secure unlock method for the first time,
default to 'Show all notification content'.
Bug: 17010183
Change-Id: I4953e2b1e605bf6f13240ef0483a37265263ea8d
2014-08-29 15:17:37 -04:00
Chris Wren
f48249a3b8
Don't allow users to set redaction on an insecure device.
...
Bug: 17106788
Change-Id: I05f8f4d920158fe99186fb8b879278d6780b8722
2014-08-29 15:17:36 -04:00
Maurice Lam
63a6b46aac
am 8dade422
: Merge "[WifiSetup] Workaround for accessibility in landscape" into lmp-dev
...
* commit '8dade422e50a6bc0916f95ab42cf0e128ff42046':
[WifiSetup] Workaround for accessibility in landscape
2014-08-29 03:36:55 +00:00
Maurice Lam
8dade422e5
Merge "[WifiSetup] Workaround for accessibility in landscape" into lmp-dev
2014-08-29 01:55:09 +00:00
Maurice Lam
182c239730
[WifiSetup] Workaround for accessibility in landscape
...
This change works around a bug that TalkBack doesn't work and keep
throwing out error logs in landscape mode.
Bug: 17320180
Change-Id: I952e8f828b6c7d67a7adfa0cb710e73a7e2864f1
2014-08-28 18:21:52 -07:00
Diego Pontoriero
ede4c009d6
am 88e5901e
: Merge "Change TelephonyManager method name to accurately reflect functionality." into lmp-dev
...
* commit '88e5901e58d69cdc9f59352fe3a672ed4ec39294':
Change TelephonyManager method name to accurately reflect functionality.
2014-08-28 22:48:45 +00:00
Selim Gurun
a80289680d
am d578fc00
: Merge "Use GoogleSetting to override DRP setting if available" into lmp-dev
...
* commit 'd578fc00b57c5d8d7122bb25d122e24779669fdb':
Use GoogleSetting to override DRP setting if available
2014-08-28 22:48:44 +00:00
Diego Pontoriero
88e5901e58
Merge "Change TelephonyManager method name to accurately reflect functionality." into lmp-dev
2014-08-28 22:38:47 +00:00
Selim Gurun
d578fc00b5
Merge "Use GoogleSetting to override DRP setting if available" into lmp-dev
2014-08-28 22:11:46 +00:00
Diego Pontoriero
be7adcc989
Change TelephonyManager method name to accurately reflect functionality.
...
Bug: 17163860
Change-Id: I319b3dc19c171108963113aa821e50842654a61e
2014-08-28 13:52:24 -07:00
Maurice Lam
198ece9c2f
am 7e392fd5
: Merge "[WifiSetup] Update illustration" into lmp-dev
...
* commit '7e392fd59a9fcc89121148cb69c12a787683959c':
[WifiSetup] Update illustration
2014-08-28 20:35:16 +00:00
PauloftheWest
bcbf7d55b4
Updated Wifi Assistant to support RTL.
...
Bug: 16798953
Change-Id: I9dc96a5a02fdc0e6b66a1ab5ddcaed95848b9c64
2014-08-28 13:29:57 -07:00
Maurice Lam
7e392fd59a
Merge "[WifiSetup] Update illustration" into lmp-dev
2014-08-28 20:27:01 +00:00
Chris Wren
60e2678c62
am b874b5c6
: Merge "Don\'t show nonesensical notification visibility value." into lmp-dev
...
* commit 'b874b5c6da093ea61c00594d506eab5a310e40e8':
Don't show nonesensical notification visibility value.
2014-08-28 19:51:32 +00:00
Chris Wren
b874b5c6da
Merge "Don't show nonesensical notification visibility value." into lmp-dev
2014-08-28 19:44:29 +00:00
Adam Lesinski
54bff843ff
am ce0083b0
: Merge "Update UI for UsageStatsSettings" into lmp-dev
...
* commit 'ce0083b05ccf9564f923eb73413346531139dccc':
Update UI for UsageStatsSettings
2014-08-28 19:15:27 +00:00
Adam Lesinski
ce0083b05c
Merge "Update UI for UsageStatsSettings" into lmp-dev
2014-08-28 19:05:46 +00:00
Christoph Studer
cd507cdb22
am 755c97d6
: Merge "Settings: Increase no&sounds char limit to 30" into lmp-dev
...
* commit '755c97d663533b20403493e82b261e8f1d246f7e':
Settings: Increase no&sounds char limit to 30
2014-08-28 18:34:40 +00:00
Christoph Studer
755c97d663
Merge "Settings: Increase no&sounds char limit to 30" into lmp-dev
2014-08-28 18:26:28 +00:00
Jeff Davidson
d4312cd3a9
am d037d04d
: Merge "Fix crash in WifiSettings." into lmp-dev
...
* commit 'd037d04dc4d1e2b2ce7da5efb5d863ddbdd589ed':
Fix crash in WifiSettings.
2014-08-28 17:34:31 +00:00
Jeff Davidson
d037d04dc4
Merge "Fix crash in WifiSettings." into lmp-dev
2014-08-28 17:25:58 +00:00
Jing Zhao
8148f2f17d
am f04d69a1
: Test APNs
...
* commit 'f04d69a1d405f88b2bebacd63c77e91789e81616':
Test APNs
2014-08-28 16:34:53 +00:00
Jing Zhao
f04d69a1d4
Test APNs
...
Add test APNs to carriers table.
Enable APN Setting editing for testing PLMNs.
Allow user to toggle carrier_enabled for test APNs.
Bug: 17136661
Change-Id: Ieabfac5ea02a5b9971c7050d8278ad0095863e3a
2014-08-28 16:22:19 +00:00
Christoph Studer
cf2e4d58db
Settings: Increase no&sounds char limit to 30
...
Bug: 17196576
Change-Id: I9baffcf19258e1d106b69a8738dbd387ec61def7
2014-08-28 15:01:19 +02:00
Sander Alewijnse
e64a2c5c6b
am ddc9b2ce
: Merge "Disable auto time checkbox if date/time locked down by DO." into lmp-dev
...
* commit 'ddc9b2ce2377edd7ce914813be374c91be150569':
Disable auto time checkbox if date/time locked down by DO.
2014-08-28 11:22:14 +00:00
Sander Alewijnse
ddc9b2ce23
Merge "Disable auto time checkbox if date/time locked down by DO." into lmp-dev
2014-08-28 11:11:38 +00:00
Selim Cinek
e83d0f63dd
am e58fda79
: Merge "Added colors to system notifications" into lmp-dev
...
* commit 'e58fda7997fd2313f0592e4bb0477d22fe5b6fb4':
Added colors to system notifications
2014-08-28 09:46:17 +00:00
Selim Cinek
e58fda7997
Merge "Added colors to system notifications" into lmp-dev
2014-08-28 09:36:45 +00:00
Adam Lesinski
1813c6297f
Update UI for UsageStatsSettings
...
Bug: 16461070
Change-Id: I616421d5ff8124892a676b8f5302b2341773d6eb
2014-08-27 19:00:30 -07:00
Jeff Davidson
0a5402dcf9
Fix crash in WifiSettings.
...
SDK version is an int, not a long. (Also change SharedPreference key
to avoid issues for people who've already dismissed the Wifi Assistant
card).
Bug: 17304642
Change-Id: Ic959516b88e91edd53562703fa7db9c15ead20e4
2014-08-27 18:05:31 -07:00
Dianne Hackborn
d683f92942
am 6d1297ed
: Merge "Fix issues #16941902 , #16901402 , and #16135174." into lmp-dev
...
* commit '6d1297ed1a9fa549e645855c54b9fb67d2020e4c':
Fix issues #16941902 , #16901402 , and #16135174 .
2014-08-27 23:41:54 +00:00