Tony Mak
64f6d9896f
Add managed profile setting page
...
Bug: 28281560
Change-Id: I1187f834dd9d002ec898a7d343198025963d1c26
2016-05-03 18:55:41 +01:00
Baligh Uddin
8c648f3fd5
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: e6a875576f
-s ours
* commit 'e6a875576f3713c755c5bbca855b43b1048b3618':
Import translations. DO NOT MERGE
Change-Id: Ia280336dd979aee7c6faf76fc77bef275f2b6285
2016-05-03 16:49:06 +00:00
Baligh Uddin
e6a875576f
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-05-03 16:41:17 +00:00
Felipe Leme
f79c20500e
Implemented onRestrictPowerChanged().
...
BUG: 28521946
Change-Id: I702e27401f74eee6ce884351ae4e0bc89ec6b8e2
2016-05-03 08:43:08 -07:00
Robin Lee
cdebe28c15
Add lockdownEnabled parameter to always-on VPN API
...
Allows callers to opt-out of blockading network traffic during boot and
on VPN app failure.
Bug: 26694104
Change-Id: Ic2c25b79d8a17917025eb37be7de929fe156e2a3
2016-05-03 13:27:05 +01:00
Baligh Uddin
e118a96fd0
Import translations. DO NOT MERGE
...
Change-Id: If49388814aafcf05ad9b1899b7e991463c8c3662
Auto-generated-cl: translation import
2016-05-03 01:25:52 -07:00
Philip P. Moltmann
0c71d3b5cf
Merge "Read disk ID from intent" into nyc-dev
...
am: e0e7fa4501
* commit 'e0e7fa4501214be7c2cdf0fbf3e503d54504bd3f':
Read disk ID from intent
Change-Id: Ia40f3b5901385cf22ddadc37131f464dbee93b2b
2016-05-02 23:24:05 +00:00
Philip P. Moltmann
e0e7fa4501
Merge "Read disk ID from intent" into nyc-dev
2016-05-02 23:00:30 +00:00
Sudheer Shanka
0814dfbccb
Merge "Show app installer info even if it doesn\'t handle ACTION.APP_SHOW_INFO." into nyc-dev
...
am: 57e6a9144a
* commit '57e6a9144a0577308bd9888f3498c17ca96e4f5f':
Show app installer info even if it doesn't handle ACTION.APP_SHOW_INFO.
Change-Id: I348e39f6519c3d620b7f3a3cba6eca72118339a9
2016-05-02 20:09:59 +00:00
Sudheer Shanka
57e6a9144a
Merge "Show app installer info even if it doesn't handle ACTION.APP_SHOW_INFO." into nyc-dev
2016-05-02 20:00:45 +00:00
Maurice Lam
0f27a312b7
Merge "Remove top padding only if illustration is present" into nyc-dev
...
am: 0e4816efb9
* commit '0e4816efb99e28a25efecee1702c552bfb9ba849':
Remove top padding only if illustration is present
Change-Id: I0b92a87785df54ca66427a4e3871f0ed4737b55f
2016-05-02 18:05:27 +00:00
Maurice Lam
0e4816efb9
Merge "Remove top padding only if illustration is present" into nyc-dev
2016-05-02 17:58:10 +00:00
Adrian Roos
3b8cc35b4a
Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev
...
am: 820d7c85c7
* commit '820d7c85c724b28267b1a5d0dee8b190f49d8517':
Properly handle rotation in NotificationLockscreenPreference
Change-Id: I1ce852a59674583c5dd2e67eeb79a4419ec15cda
2016-05-02 15:21:02 +00:00
Adrian Roos
820d7c85c7
Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev
2016-05-02 15:13:40 +00:00
Philip P. Moltmann
2fc2eb49a9
Read disk ID from intent
...
mDisk might be null, but we can recover the disk ID from the original
Intent.
Bug: 28177789
Change-Id: Ic3e33a60084c42eb0bb06145ad50a45077e650d0
2016-04-29 16:35:28 -07:00
Maurice Lam
4d227268c6
Remove top padding only if illustration is present
...
Bug: 28469515
Change-Id: Ifc41b09b2b1675b696291753ff68fe4a801c76c2
2016-04-29 15:07:40 -07:00
Adrian Roos
4bd42073d4
Properly handle rotation in NotificationLockscreenPreference
...
There were some issues because we didn't explicitly
track and restore the selected position upon rotating,
so the fragment's oppinion of which item was selected
didn't match the ListView's.
Change-Id: Ia86e25dab36b44931297f8bcc7bcb7d6974f4b76
Fixes: 27921546
2016-04-29 14:37:16 -07:00
Jason Monk
4b32f9f5ad
Merge "Don\'t crash on Settings data usage" into nyc-dev
...
am: b60c7560af
* commit 'b60c7560afe6c4326d9e77423b31e0dcbf452506':
Don't crash on Settings data usage
Change-Id: I0659dc194c2fb16dda9771e9a5a7b1d3375887b4
2016-04-29 18:58:41 +00:00
Jason Monk
b60c7560af
Merge "Don't crash on Settings data usage" into nyc-dev
2016-04-29 18:54:08 +00:00
Jason Monk
bc4e200a59
Don't crash on Settings data usage
...
Consider Settings uid (SYSTEM_UID) to be an app.
Change-Id: Ia5cc7897eafdf3d654e8a23715bd25502097bab8
Fixes: 28193076
2016-04-29 14:06:10 -04:00
Jason Monk
cf5a448ce5
Merge "Don\'t crash settings when out of space." into nyc-dev
...
am: a1fe122b99
* commit 'a1fe122b99a89e13ef3e06364df519ca93a35dcc':
Don't crash settings when out of space.
Change-Id: Id336b4dcf1ab7fce3581286d598cf590c4973548
2016-04-29 17:57:27 +00:00
Jason Monk
a1fe122b99
Merge "Don't crash settings when out of space." into nyc-dev
2016-04-29 17:54:34 +00:00
Jason Monk
ef71f605f3
Don't crash settings when out of space.
...
Change-Id: I2e36fe845601558d789f38ae9f70d1a1684d8fd4
Fixes: 28198128
2016-04-29 13:51:08 -04:00
Mihai Nita
f02a31beaa
Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev
...
am: 7dce005fab
* commit '7dce005fabf15c3532db0540cdc2c67e59da7fb4':
Fix: accessibility actions move languages but don't update
Change-Id: Ie565b3a9d7d7caa00d8be389774b397339fec1b9
2016-04-29 17:50:39 +00:00
Mihai Niță
7dce005fab
Merge "Fix: accessibility actions move languages but don't update" into nyc-dev
2016-04-29 17:46:16 +00:00
Clara Bayarri
1159a0a79c
Merge "Remove Secure Startup option from Security Settings" into nyc-dev
...
am: 35bf932eb0
* commit '35bf932eb0daf8038cc917508839784953c45c72':
Remove Secure Startup option from Security Settings
Change-Id: Id555f9a2abadf9a941e5e63e60ea55c5ce7179bd
2016-04-29 17:38:56 +00:00
Clara Bayarri
35bf932eb0
Merge "Remove Secure Startup option from Security Settings" into nyc-dev
2016-04-29 17:28:42 +00:00
Clara Bayarri
0a84fd121d
Merge "Storage Settings shows hamburger instead of back arrow" into nyc-dev
...
am: d2549ce663
* commit 'd2549ce6635943144bde17582b825113c07aa868':
Storage Settings shows hamburger instead of back arrow
Change-Id: I178049719bc00f5baddce247c257004ec41fcbbe
2016-04-29 16:46:27 +00:00
Clara Bayarri
d2549ce663
Merge "Storage Settings shows hamburger instead of back arrow" into nyc-dev
2016-04-29 16:38:12 +00:00
Clara Bayarri
f534a66afd
Storage Settings shows hamburger instead of back arrow
...
When there is only internal storage, StorageSettings forwards
automatically to this sub settings page, causing the navigation
icon to be the back arrow. Fixed to make it a hamburger in this
case.
Bug: 28197210
Change-Id: Ief3f7daa3973332a800faa652261e2cfdec36e85
2016-04-29 16:58:09 +01:00
Julia Reynolds
1d5fbf6672
Merge "Fix NPE in user settings." into nyc-dev
...
am: e69d754865
* commit 'e69d754865572edf40a59c0edbf657a0d7948865':
Fix NPE in user settings.
Change-Id: Icb2585bb7619e9bac4592f904b8978b8668ba4ff
2016-04-29 14:34:28 +00:00
Julia Reynolds
e69d754865
Merge "Fix NPE in user settings." into nyc-dev
2016-04-29 14:29:18 +00:00
shwetachahar
bf4e0306bc
Merge "Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java" into nyc-dev
...
am: 19c01f0351
* commit '19c01f03511610541ab80b8f565381da31d21926':
Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java
Change-Id: I0b55dd38a001726331012df441de34ba998c512f
2016-04-29 13:34:19 +00:00
Shweta Chahar
19c01f0351
Merge "Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java" into nyc-dev
2016-04-29 13:29:10 +00:00
Julia Reynolds
8bda21a9d4
Fix NPE in user settings.
...
Bug: 28337026
Change-Id: I437874e8dd605b9a19318aafecf292303ee3ad58
2016-04-29 08:42:01 -04:00
Philip P. Moltmann
16d64842d9
Handling of issues while migrating primary storage
...
am: 1ec941db0c
* commit '1ec941db0ce37a864b5aa1a92111e5c52953c33e':
Handling of issues while migrating primary storage
Change-Id: Ic298e031e2b8b2afcfce5a4f01b34f6c7dd13b65
2016-04-28 23:21:50 +00:00
Philip P. Moltmann
1ec941db0c
Handling of issues while migrating primary storage
...
Bug: 28177789
Change-Id: Icfbd048ddf0a1d55df1e7273d49727357b98a452
2016-04-28 14:44:53 -07:00
Julia Reynolds
8136b125f6
Expand BT screen.
...
am: 05c6a2c007
* commit '05c6a2c007675fede50245519571879f749c8e66':
Expand BT screen.
Change-Id: I0c3ed43962f1618b4cffe054bcff1fff0b5e0893
2016-04-28 19:35:28 +00:00
Julia Reynolds
05c6a2c007
Expand BT screen.
...
Bug: 27106877
Change-Id: I31100598f27d45b6a50351f14bd0d20cc6e27d9d
2016-04-28 14:27:02 -04:00
shwetachahar
7c0bc8ed76
Set the max for pitch seekbar in xml in sync with the max for pitch
...
seekbar in TextToSpeechSettings.java
Bug: 28257828
Change-Id: I8a114cf31d72eedf1ba03093364074bec7e7cdee
2016-04-28 16:09:18 +01:00
Jason Monk
db723c9221
Merge "Fix summary lifecycle" into nyc-dev
...
am: 6e51591
* commit '6e5159185388ed97c5b1a8648c1c6f2396d124a2':
Fix summary lifecycle
Change-Id: Ic66ba905b1f225bbfaff6db51164727a21599238
2016-04-28 14:58:11 +00:00
Jason Monk
6e51591853
Merge "Fix summary lifecycle" into nyc-dev
2016-04-28 14:51:59 +00:00
Jason Monk
8d8de14905
Fix summary lifecycle
...
Once more and probably not for all
Don't let multiple listening state changes get queued, this can cause
rapid changes like listening->not listening->listening. Also store
listening state on the worker thread now that we drop some state
messages and only notify summaries when there is a state change.
Change-Id: I93a5f364e9b35929f9088e044ebefd9be69740e6
Fixes: 28319383
2016-04-28 10:42:10 -04:00
Jason Monk
5745801014
Merge "Fix search after upgrade" into nyc-dev
...
am: f96b594
* commit 'f96b5947f9122e471d7cc72847f707bc4dcc30a4':
Fix search after upgrade
Change-Id: I5e393db4d91a59b491077ede1563bc0fe036a023
2016-04-28 14:17:28 +00:00
Jason Monk
f96b5947f9
Merge "Fix search after upgrade" into nyc-dev
2016-04-28 14:13:44 +00:00
Jason Monk
18fbdd023b
Fix search after upgrade
...
Settings was dropping the search tables after upgrade but not
clearing the bit that says a full index has completed.
Change-Id: If49960b8cc07e72127bac211ae4d6c1f25b71c81
Fixes: 28414461
2016-04-28 10:08:29 -04:00
Jason Monk
c6d5902370
Merge "Default payment settings to disabled" into nyc-dev
...
am: 6b421dd
* commit '6b421dd4f6250bceba673d6f86dcb48026517b01':
Default payment settings to disabled
Change-Id: Id7db30f04e32d212fa1edc719ad0363e468bec67
2016-04-28 12:59:34 +00:00
Jason Monk
6b421dd4f6
Merge "Default payment settings to disabled" into nyc-dev
2016-04-28 12:56:46 +00:00
Wei Wang
ec8b526fd0
Merge "Add an entry in developer options for location tools." into nyc-dev
...
am: 920cf0a
* commit '920cf0a7b3ae75c6844bcb7994fd36d3e7968506':
Add an entry in developer options for location tools.
Change-Id: I5af67764994e4cfed9f8ef4243954260d48ae163
2016-04-28 06:03:17 +00:00
Wei Wang
920cf0a7b3
Merge "Add an entry in developer options for location tools." into nyc-dev
2016-04-28 05:57:30 +00:00