Commit Graph

12823 Commits

Author SHA1 Message Date
Wei Wang
d0d3ca3b7c Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev 2016-06-02 17:14:02 +00:00
Wei Wang
a0b28146ba Revert "Add an entry in developer options for location tools."
Bug:28251942

This reverts commit e1c1a13cba.

Change-Id: I864a813e8f6a9488b4db2f876a0097e947ceae45
2016-06-02 04:42:02 +00:00
Jason Monk
2cf7ecc1d4 Merge "onResume -> onStart, onPause -> onStop" into nyc-dev
am: 67e87fa4e9

* commit '67e87fa4e903306d4e430acd871dbad0c189b06b':
  onResume -> onStart, onPause -> onStop

Change-Id: I1ca7fdc7246d40c82b3828b5d46762987a0d9a14
2016-06-01 20:32:26 +00:00
Jason Monk
718c84f121 resolve merge conflicts of 67e87fa to nyc-mr1-dev
Change-Id: I8c5a79de3176912a1803a481b8b179faf1dad178
2016-06-01 16:20:01 -04:00
Jason Monk
67e87fa4e9 Merge "onResume -> onStart, onPause -> onStop" into nyc-dev 2016-06-01 20:09:00 +00:00
Sudheer Shanka
e59a7d1004 Merge "Start DeviceAdminSettings in a new task from support dialog." into nyc-dev am: df66d4abf0 am: 4080861e75
am: 1da829632c

* commit '1da829632c67409a3cf43bd34ba9cd3765bd58a6':
  Start DeviceAdminSettings in a new task from support dialog.

Change-Id: I70af91afd7cbb376ef30387d5dc3486d8544afa2
2016-06-01 19:54:06 +00:00
Sudheer Shanka
1da829632c Merge "Start DeviceAdminSettings in a new task from support dialog." into nyc-dev am: df66d4abf0
am: 4080861e75

* commit '4080861e75bb001413cab1f8a4ce46cb5a3f259e':
  Start DeviceAdminSettings in a new task from support dialog.

Change-Id: I95148191a78092ef2c69db331eba06c8d7409be8
2016-06-01 18:57:16 +00:00
Sudheer Shanka
61617948f6 Merge "Start DeviceAdminSettings in a new task from support dialog." into nyc-dev
am: df66d4abf0

* commit 'df66d4abf0c994b5f53ec0978ba97e746852e3e9':
  Start DeviceAdminSettings in a new task from support dialog.

Change-Id: I662b0b1b6f316564a3f9a318e558d02f3c8a96d0
2016-06-01 18:39:52 +00:00
Sudheer Shanka
4080861e75 Merge "Start DeviceAdminSettings in a new task from support dialog." into nyc-dev
am: df66d4abf0

* commit 'df66d4abf0c994b5f53ec0978ba97e746852e3e9':
  Start DeviceAdminSettings in a new task from support dialog.

Change-Id: I6a249b3e238f0ab8336e1a6d81bf77d7b2d3a11d
2016-06-01 18:39:24 +00:00
TreeHugger Robot
df66d4abf0 Merge "Start DeviceAdminSettings in a new task from support dialog." into nyc-dev 2016-06-01 18:16:21 +00:00
Jason Monk
e1563eec48 Merge "Cache account prefs so we don\'t lose a11y focus" into nyc-dev am: 9791704411 am: 4436467a25
am: 69f0f29e38

* commit '69f0f29e380e2915a7a59c9e1664ecc7db242ca9':
  Cache account prefs so we don't lose a11y focus

Change-Id: I106eb14e89de5928ec3e746979ba0f4763c1c938
2016-06-01 18:06:14 +00:00
Jason Monk
7a27663307 Merge "Fix apps spinner jank." into nyc-dev am: ad302548ea am: dc8738fda2
am: d2a07dfdfa

* commit 'd2a07dfdfa740fcc22a64ab3269251caec12270c':
  Fix apps spinner jank.

Change-Id: I7b940911c52a6b15d2773021e93a30107ef5eaea
2016-06-01 18:06:13 +00:00
Jason Monk
350a930c68 onResume -> onStart, onPause -> onStop
For SettingsActivity and DashboardSummary

Bug: 28896214
Change-Id: I235d5c82b04b1363bf4416acb5cf5fc1c4db704f
2016-06-01 13:45:25 -04:00
Jason Monk
69f0f29e38 Merge "Cache account prefs so we don\'t lose a11y focus" into nyc-dev am: 9791704411
am: 4436467a25

* commit '4436467a25416b382216385a231c75409c4a19b8':
  Cache account prefs so we don't lose a11y focus

Change-Id: I1fa94e39b3034dafc0e88f1d9f96262ce08cc7c2
2016-06-01 17:42:35 +00:00
Jason Monk
d2a07dfdfa Merge "Fix apps spinner jank." into nyc-dev am: ad302548ea
am: dc8738fda2

* commit 'dc8738fda2a077bef2a08fd0b2444a4489b5388a':
  Fix apps spinner jank.

Change-Id: I48b1645138c047f995fb379a837594964bd27e2d
2016-06-01 17:42:34 +00:00
Jason Monk
4436467a25 Merge "Cache account prefs so we don\'t lose a11y focus" into nyc-dev
am: 9791704411

* commit '979170441191f4c0fa292def1f2124bd62f70ffb':
  Cache account prefs so we don't lose a11y focus

Change-Id: I9076c38574c780a20cb98f74baa092824ec1c16f
2016-06-01 17:37:12 +00:00
Jason Monk
dc8738fda2 Merge "Fix apps spinner jank." into nyc-dev
am: ad302548ea

* commit 'ad302548ea5a030c2e44eb22a212285493037729':
  Fix apps spinner jank.

Change-Id: I910f10090e2407c683435f7d3c4d20036c2465b5
2016-06-01 17:37:11 +00:00
Jason Monk
6548f7f3f5 Merge "Cache account prefs so we don\'t lose a11y focus" into nyc-dev
am: 9791704411

* commit '979170441191f4c0fa292def1f2124bd62f70ffb':
  Cache account prefs so we don't lose a11y focus

Change-Id: I475b564279160e4100008fb6affb48d1659de05f
2016-06-01 17:30:19 +00:00
Jason Monk
f4c27c2689 Merge "Fix apps spinner jank." into nyc-dev
am: ad302548ea

* commit 'ad302548ea5a030c2e44eb22a212285493037729':
  Fix apps spinner jank.

Change-Id: I1867f2166dea86a9debd6f4304d6e43a8cbe32aa
2016-06-01 17:30:13 +00:00
Jason Monk
9791704411 Merge "Cache account prefs so we don't lose a11y focus" into nyc-dev 2016-06-01 17:19:56 +00:00
Jason Monk
cd66b4a99f Cache account prefs so we don't lose a11y focus
Fixes: 28767151
Change-Id: I876712c42b02bb2efaaa492ad951ad42935ecb32
2016-06-01 17:19:01 +00:00
Jason Monk
ad302548ea Merge "Fix apps spinner jank." into nyc-dev 2016-06-01 17:03:54 +00:00
Jason Monk
8a5d4bfbb8 Fix apps spinner jank.
Change-Id: I7fbe580627538037fd0f1823787f7dcebbb43252
Fixes: 29056706
2016-06-01 12:57:05 -04:00
Sudheer Shanka
65cabcd4ee Start DeviceAdminSettings in a new task from support dialog.
Bug: 28998790
Change-Id: Ia43d6e719124e0908ec8ccb8c1ba7e80b5297096
2016-06-01 16:29:20 +00:00
Robin Lee
3682dd09e6 Disable restricted VPN actions onResume am: 52541536d0 am: 849edeb23e
am: 93e8676ecc

* commit '93e8676ecc8c449aad03c9cb2e08c7aec50d4550':
  Disable restricted VPN actions onResume

Change-Id: I947153cc892c6d072b287fd5221529913095af79
2016-06-01 14:30:49 +00:00
Robin Lee
93e8676ecc Disable restricted VPN actions onResume am: 52541536d0
am: 849edeb23e

* commit '849edeb23e2bc7e798159a497039aa81320ec47c':
  Disable restricted VPN actions onResume

Change-Id: I2875be42188dc978a431a78d3b4d6260d5a075b1
2016-06-01 14:26:19 +00:00
Robin Lee
8a8f3f2f34 Disable restricted VPN actions onResume
am: 52541536d0

* commit '52541536d0d4c8f78be26f94fa8f0cf297bde1c4':
  Disable restricted VPN actions onResume

Change-Id: I24606b4201605bea8377c5385b5b8d1720a44cb1
2016-06-01 14:22:07 +00:00
Robin Lee
849edeb23e Disable restricted VPN actions onResume
am: 52541536d0

* commit '52541536d0d4c8f78be26f94fa8f0cf297bde1c4':
  Disable restricted VPN actions onResume

Change-Id: I24772b0a6bc5b34bb5dc98508d26ab98d43bc670
2016-06-01 14:22:07 +00:00
Robin Lee
52541536d0 Disable restricted VPN actions onResume
Otherwise it's pretty easy to circumvent any future restrictions by
keeping VPN settings for a particular app open and continuing to use
it even after DISALLOW_CONFIG_VPN is applied.

Two checks:
 1) in onResume (catches almost every case)
 2) in setAlwaysOn (catches every remaining case)

Bug: 28733079
Change-Id: I1c67bb14891ef620df5ed65fbd32678e417b4a65
2016-06-01 11:32:32 +01:00
Victor Chang
13adfba9ad Merge "Show different strings when PO/DO user approves a cert" into nyc-dev am: 36522e8854 am: 5ab70294ed
am: 24b39dce00

* commit '24b39dce002479369c782887b036f936cb27c776':
  Show different strings when PO/DO user approves a cert

Change-Id: Iced70f167bcf899a4dab8c16e048a90d41b0d310
2016-06-01 10:22:44 +00:00
Victor Chang
24b39dce00 Merge "Show different strings when PO/DO user approves a cert" into nyc-dev am: 36522e8854
am: 5ab70294ed

* commit '5ab70294ed03f83fd0789477a005225d8caebd5c':
  Show different strings when PO/DO user approves a cert

Change-Id: Ib0e1fc2a8f086e7ebf06b3f745f18c343a9ac682
2016-06-01 10:18:07 +00:00
Victor Chang
5ab70294ed Merge "Show different strings when PO/DO user approves a cert" into nyc-dev
am: 36522e8854

* commit '36522e885479b30bc49a8a7333f436d5744431bc':
  Show different strings when PO/DO user approves a cert

Change-Id: I1cf166e58afd13c0927eb4460a7d88a22ba9dfe7
2016-06-01 10:13:52 +00:00
Victor Chang
7a37b70bda Merge "Show different strings when PO/DO user approves a cert" into nyc-dev
am: 36522e8854

* commit '36522e885479b30bc49a8a7333f436d5744431bc':
  Show different strings when PO/DO user approves a cert

Change-Id: I5dd1261e9def95d952538736401bb4c16f6fb61a
2016-06-01 10:13:51 +00:00
Victor Chang
36522e8854 Merge "Show different strings when PO/DO user approves a cert" into nyc-dev 2016-06-01 10:07:16 +00:00
宋凯伦
0fb2f2bd00 Fix the memory leak in TetherSettings
https://code.google.com/p/android/issues/detail?id=210848

We need to close the bluetooth adapter's profile proxy in OnDestroy 
method, or it will cause TetherSettings object to be held and won't
release. And finally it will cause OOM issue.
Change-Id: Id7667f751697c8ef9fccaaabfed28a91d4fa4960
Signed-off-by: 宋凯伦 <songkailun@xiaomi.com>
2016-06-01 02:13:50 +00:00
Meng Wang
fddffa539d Launch E911 address management activity at turning on Wifi Calling am: 90e8e4713c
am: 0500f2bede

* commit '0500f2bedefe3ecf61e395d5a2285c6972024b3d':
  Launch E911 address management activity at turning on Wifi Calling

Change-Id: Ibcc27498999a5f2f62589bab349318cbdb6f2a50
2016-06-01 00:57:14 +00:00
Meng Wang
0500f2bede Launch E911 address management activity at turning on Wifi Calling
am: 90e8e4713c

* commit '90e8e4713c7710f765868ed90f69e2424eb19fe5':
  Launch E911 address management activity at turning on Wifi Calling

Change-Id: Ie526f9a5c0d6f66c5e8c79c6ac3299a4aa5a4db6
2016-06-01 00:46:33 +00:00
Meng Wang
90e8e4713c Launch E911 address management activity at turning on Wifi Calling
Bug: 28404126
Change-Id: Id551d784d151e5f24cfcec96e6cf4b999f39ce0f
2016-05-31 15:57:27 -07:00
Victor Chang
71d1fed0e7 Show different strings when PO/DO user approves a cert
1. This is confusing for restricted users who don't have any options other
than 'Trust'.
2. show dialog title of "Check certificate" instead of "Trust or remove certificate"

The change only applies to ProfileOwner and DeviceOwner case

Fix: 28875819
Change-Id: I3f7dc8f3dcac75b4d99814cbc9af67433676a8c7
2016-05-31 22:43:09 +01:00
Andrew Sapperstein
15b78d8f19 Merge "Remove the last vestiges of #ff009587." into nyc-mr1-dev am: 9ca09c020e
am: 59358568d0

* commit '59358568d0220dc800cca3ff7633331dfe7e224a':
  Remove the last vestiges of #ff009587.

Change-Id: I3cc323f8b6c98c602f5d934a1d5afb50e82f49d3
2016-05-31 18:46:26 +00:00
Andrew Sapperstein
59358568d0 Merge "Remove the last vestiges of #ff009587." into nyc-mr1-dev
am: 9ca09c020e

* commit '9ca09c020e561832cd2e4b5abd43c839c461c240':
  Remove the last vestiges of #ff009587.

Change-Id: Iac6ec5047f88b277d313b98c19c4eac4ddce626f
2016-05-31 18:43:59 +00:00
Andrew Sapperstein
9ca09c020e Merge "Remove the last vestiges of #ff009587." into nyc-mr1-dev 2016-05-31 18:38:07 +00:00
Daniel Nishi
b6b9d830d6 Merge "Add an automatic storage management job service." into nyc-mr1-dev am: d7efefa503
am: f878423e3d

* commit 'f878423e3dd6cebaac5b77a91c95f2e3ae58c125':
  Add an automatic storage management job service.

Change-Id: I63cfc0885b1075e73fbeed65eac8c04eef161851
2016-05-31 18:33:56 +00:00
Daniel Nishi
f878423e3d Merge "Add an automatic storage management job service." into nyc-mr1-dev
am: d7efefa503

* commit 'd7efefa503ae408072e45dc6520a4236b8ef40cb':
  Add an automatic storage management job service.

Change-Id: Idd479e72efbe2d62225493c0dfdb7d55ee4f8b20
2016-05-31 18:31:32 +00:00
Daniel Nishi
d7efefa503 Merge "Add an automatic storage management job service." into nyc-mr1-dev 2016-05-31 18:25:18 +00:00
Daniel Nishi
80c204420b Add an automatic storage management job service.
This service runs once a day when plugged in when the device has
under 15% free space remaining. If the FeatureFactory has a
storage management job, it runs the job to begin to free up space
on the device.

This is a temporary landing place and will be refactored very
quickly out of Settings.

Bug: 28600825

Change-Id: Id2ebb42a333b3b4e3daef4e50cf985fe055b85c7
2016-05-31 16:50:48 +00:00
Anna Galusza
062539b7a3 Merge "Change Nav bar style to use system nav (new style for Nexus N+) Bug: 27612740" into nyc-mr1-dev am: bab65d9fc4
am: 92f200b09c

* commit '92f200b09c76ae364c8e1eb9b09a4a012a56a9d8':
  Change Nav bar style to use system nav (new style for Nexus N+) Bug: 27612740

Change-Id: Ied2a365be78f8495aeb293d6c60cfa2da14f2004
2016-05-31 16:50:28 +00:00
Anna Galusza
92f200b09c Merge "Change Nav bar style to use system nav (new style for Nexus N+) Bug: 27612740" into nyc-mr1-dev
am: bab65d9fc4

* commit 'bab65d9fc41836624bf385898ad21ca14d2f72fe':
  Change Nav bar style to use system nav (new style for Nexus N+) Bug: 27612740

Change-Id: Icb6c321b7382fe3816cde21e9db72b07f7ba0084
2016-05-31 16:45:39 +00:00
Anna Galusza
bab65d9fc4 Merge "Change Nav bar style to use system nav (new style for Nexus N+) Bug: 27612740" into nyc-mr1-dev 2016-05-31 16:39:46 +00:00
Roozbeh Pournader
f297a3da49 Merge "Show only up to two locales in Settings" into nyc-dev am: a260cf8931 am: c34946b8fb
am: e784c743d9

* commit 'e784c743d9e255a14030bc006c96433acdb9275c':
  Show only up to two locales in Settings

Change-Id: I9c7c5eaf55bf68aea8f23e28ccf14b622c049bac
2016-05-31 01:31:58 +00:00