Commit Graph

21392 Commits

Author SHA1 Message Date
Wei Liu
e0021c426c Move NetworkPolicyEditor from Settings packge to settingslib.
Change-Id: I3a2f69c73d983643e65a0d4266cb98a203d5a813
2015-07-07 17:12:30 -07:00
Christopher Tate
d0528b69d4 am fe71156d: am 8023385e: Merge "App link handling is not just for "official" verified handlers" into mnc-dev
* commit 'fe71156d076792eebd250dc22c5d2e9485f9cf58':
  App link handling is not just for "official" verified handlers
2015-07-08 00:08:17 +00:00
Christopher Tate
fe71156d07 am 8023385e: Merge "App link handling is not just for "official" verified handlers" into mnc-dev
* commit '8023385e56e472a55e9c6f5034e04a10f1088f57':
  App link handling is not just for "official" verified handlers
2015-07-07 23:49:11 +00:00
Christopher Tate
8023385e56 Merge "App link handling is not just for "official" verified handlers" into mnc-dev 2015-07-07 23:36:15 +00:00
Christopher Tate
a08a225d18 App link handling is not just for "official" verified handlers
Allow apps to be enabled as link handlers for their accepted domains
even when they are not the "official" apps for those domains.

Also clean up a bunch of inconsistent/wrong state reporting in the UI.

Bug 22069429

Change-Id: Ic3b2bcc476dfc30085d3df7412b02bdc5d53df6d
2015-07-07 14:09:52 -07:00
Amith Yamasani
0531c255e6 am 8a62bf97: am 8e9aca37: am 7ac21204: Merge "Use localized name for guest user" into mnc-dev
* commit '8a62bf97e614d7c644ce600b6e14a7aab79892f6':
  Use localized name for guest user
2015-07-07 21:09:42 +00:00
Amith Yamasani
8a62bf97e6 am 8e9aca37: am 7ac21204: Merge "Use localized name for guest user" into mnc-dev
* commit '8e9aca37c6045aeffe83f13a0664cb950a7f7fef':
  Use localized name for guest user
2015-07-07 20:54:18 +00:00
Amith Yamasani
8e9aca37c6 am 7ac21204: Merge "Use localized name for guest user" into mnc-dev
* commit '7ac21204e16c797cc4f818ccc51509d425ffaf80':
  Use localized name for guest user
2015-07-07 20:37:31 +00:00
Amith Yamasani
7ac21204e1 Merge "Use localized name for guest user" into mnc-dev 2015-07-07 20:20:03 +00:00
Robin Lee
290784afde Match getLegacyVpn calls to changed interface
The userId argument is now explicit. Pre-requisite for bug 21499103

Change-Id: Ib83e9615326ea484ef6d63fb1a1d9c1659999dab
2015-07-07 12:35:14 -07:00
Zoltan Szatmary-Ban
6a00f6cf0b Making Settings > Storage multiprofile aware
Also fixing the order of preferences there.

Bug: 22223456
Bug: 22117317
Change-Id: I9261fe46bfce518fd1ce3d0faef07cffe6869e34
2015-07-07 20:33:30 +01:00
Sanket Padawe
aa165e0a50 Locale based string changes in BT.
Bug: 22219203
Change-Id: Ic920621baf769032475da32ea425097aafa0922e
2015-07-07 12:13:08 -07:00
Jason Monk
38f1889fea Handle uninstall from notifications list
Don't crash in InstalledAppDetails on invalid app and finish app
notification details when the app goes away.

Bug: 22311566
Change-Id: I0bb7302dc16dd1a6f3aca152037705ad657d5554
2015-07-07 14:57:47 -04:00
Amith Yamasani
5d69aaea2a Use localized name for guest user
Rather than use the stored name, which depends on the language
in use when the Guest was created, always try to use the localized
word for Guest.

Bug: 22205776
Change-Id: I1a4912b9561196eee811eae31c8df2b72413648f
2015-07-07 10:13:12 -07:00
Zoltan Szatmary-Ban
ec323a0849 Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
Bug: 22291579
Change-Id: I32611404ef5f58c7484fe5c4b7a4f7782cc8daa3
2015-07-07 13:24:07 +01:00
Sanket Padawe
8c5d5c8c56 Disable CA certificate for EAP-SIM, AKA & AKA'
Bug: 21877800
Change-Id: I66dbb12ebcf94c094d2a71d91d8b2eeef8cf6f48
2015-07-06 16:14:43 -07:00
Jorim Jaggi
21b0521195 am a0357604: am 30001127: am 2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev
* commit 'a03576049fb71b42829304a46740a2696a233e29':
  Text changes to assist & voice input
2015-07-06 21:33:39 +00:00
Jorim Jaggi
a03576049f am 30001127: am 2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev
* commit '30001127b22ef39e02155919adaa3906829c9688':
  Text changes to assist & voice input
2015-07-06 21:20:03 +00:00
Jorim Jaggi
30001127b2 am 2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev
* commit '2bd619d5ed2cdf5a34c3e3830469edc3b29a6eb0':
  Text changes to assist & voice input
2015-07-06 21:04:31 +00:00
Jorim Jaggi
2bd619d5ed Merge "Text changes to assist & voice input" into mnc-dev 2015-07-06 20:48:40 +00:00
Jeff Sharkey
41e81016f6 am fe015ffe: am 355c13d2: am 66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev
* commit 'fe015ffe40c19d60d11b394790e259c513f15ef8':
  Fix init order so we have something to measure.
2015-07-06 19:02:19 +00:00
Jeff Sharkey
084dd0487c am fc963764: am bdb64bf1: am 7616b00b: Merge changes from topic \'mig\' into mnc-dev
* commit 'fc963764ab93bd2e6fce2a214f9cc992dbceda73':
  Fix some ordering, colors, and accessibility bugs.
  Handle missing migration source volume.
2015-07-06 19:02:18 +00:00
Jorim Jaggi
ae6e7292fa Text changes to assist & voice input
Bug: 22063668
Change-Id: I3454f6409d1f5816469505404c77d6a02e53aa50
2015-07-06 18:49:26 +00:00
Jeff Sharkey
fe015ffe40 am 355c13d2: am 66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev
* commit '355c13d294a6c572637571d7df6369916e92394d':
  Fix init order so we have something to measure.
2015-07-06 18:45:37 +00:00
Jeff Sharkey
fc963764ab am bdb64bf1: am 7616b00b: Merge changes from topic \'mig\' into mnc-dev
* commit 'bdb64bf194c882242af6d2c30cdb421a06cce69a':
  Fix some ordering, colors, and accessibility bugs.
  Handle missing migration source volume.
2015-07-06 18:45:35 +00:00
Robin Lee
6f4951a1fa Restore Vpn advanced options on re-init or rotate
Visibility isn't restored as part of instance state by default.

Bug: 22183281
Change-Id: I86a7165e918251bc32f6884b9ad5f9c5987ca075
2015-07-06 11:40:27 -07:00
Jeff Sharkey
355c13d294 am 66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev
* commit '66b5a58a6850cbf3a3fdbb8df913f0fc5ea5bdaa':
  Fix init order so we have something to measure.
2015-07-06 18:12:56 +00:00
Jeff Sharkey
bdb64bf194 am 7616b00b: Merge changes from topic \'mig\' into mnc-dev
* commit '7616b00bb5968382c5f49394fc842049f7ce9185':
  Fix some ordering, colors, and accessibility bugs.
  Handle missing migration source volume.
2015-07-06 18:12:55 +00:00
Jeff Sharkey
66b5a58a68 Merge "Fix init order so we have something to measure." into mnc-dev 2015-07-06 18:00:33 +00:00
Jeff Sharkey
7616b00bb5 Merge changes from topic 'mig' into mnc-dev
* changes:
  Fix some ordering, colors, and accessibility bugs.
  Handle missing migration source volume.
2015-07-06 17:57:53 +00:00
Jeff Sharkey
215fa65c10 Fix init order so we have something to measure.
Otherwise we start measuring without shared storage in place, meaning
we always find sizes of 0.

Bug: 22231501
Change-Id: I760064684e76e5ef5cce351aee1d81a971f4d4ea
2015-07-06 10:17:44 -07:00
Geoff Mendal
b9819796dd am 1c2260a1: (-s ours) am c869c959: (-s ours) am e21573da: (-s ours) Import translations. DO NOT MERGE
* commit '1c2260a107cd5ffa708e8addf2501014d86dc37e':
  Import translations. DO NOT MERGE
2015-07-06 15:33:03 +00:00
Geoff Mendal
1c2260a107 am c869c959: (-s ours) am e21573da: (-s ours) Import translations. DO NOT MERGE
* commit 'c869c9597546c9e8f39bc71e0f98b10b341d9e73':
  Import translations. DO NOT MERGE
2015-07-06 15:17:10 +00:00
Geoff Mendal
c869c95975 am e21573da: (-s ours) Import translations. DO NOT MERGE
* commit 'e21573da9205343e5b531f468b534a1bf02098fe':
  Import translations. DO NOT MERGE
2015-07-06 15:02:23 +00:00
Geoff Mendal
e21573da92 Import translations. DO NOT MERGE
Change-Id: I2ca583a0b6b57e1c1cc27e5aaae009e85f906b86
Auto-generated-cl: translation import
2015-07-06 07:49:17 -07:00
Jeff Sharkey
48751c1a51 Fix some ordering, colors, and accessibility bugs.
When adding preferences to public/private details screens, always
add in-order when rebuilding.  Hacky fix for broken summary text and
eject image color tints.

Fix crash when device rotated during partitioning.  Set correct
accessibility titles in all wizard steps.

Bug: 22098044, 21376962
Change-Id: I68aff96cba497a91919cad8865722bc9cef7eaa7
2015-07-05 22:10:13 -07:00
Jeff Sharkey
6a0082b483 Handle missing migration source volume.
Users can try migrating primary storage while the current location
is missing/unmounted.  Fail gracefully instead of runtime restarting.

Bug: 21927076
Change-Id: I54b92487faf9e62d5d309734bf4c436a9259d156
2015-07-05 14:25:44 -07:00
Svetoslav
bdfc2b0f94 am 5b45c3cb: Fix build
* commit '5b45c3cb2fdd9299a3fa632047f3da1bec4e868a':
  Fix build
2015-07-02 01:47:59 +00:00
Svetoslav
5b45c3cb2f Fix build
Change-Id: I658528a9b0a8a281a2b30b2915c1be6963759378
2015-07-01 18:33:32 -07:00
Marco Nelissen
f35bd64130 am b8b20a50: Merge "Fix USB mode development setting" into mnc-dev
* commit 'b8b20a503255da8097d64a2f1554d118f8e3c424':
  Fix USB mode development setting
2015-07-02 00:46:53 +00:00
Marco Nelissen
b8b20a5032 Merge "Fix USB mode development setting" into mnc-dev 2015-07-01 19:13:44 +00:00
Geoff Mendal
ad44e83e0a am 85a71d6a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '85a71d6a622eef2cc5258e737c305227cebe2e95':
  Import translations. DO NOT MERGE
2015-07-01 16:21:50 +00:00
Jason Monk
a6eca19ad1 am f7806581: Avoid crashing
* commit 'f7806581e582e5921d0eb4caa9751d1aa429bc47':
  Avoid crashing
2015-07-01 16:21:31 +00:00
Avish Shah
76ffaaa238 am ad1f28cd: Device Discoverability not set properly when Bluetooth is toggled
* commit 'ad1f28cde0ec117a0d526bae61fb661587914f33':
  Device Discoverability not set properly when Bluetooth is toggled
2015-07-01 16:19:36 +00:00
Marco Nelissen
e6ffe31754 Fix USB mode development setting
USB mode consists of the function (mtp, ptp, midi, etc) and the data
locked/unlocked state. Developer settings was only setting the
function, leaving data locked when it should be unlocked.

Bug: 22165902
Change-Id: Ia1ae8dfaf3d2abc62034aa6aea1234bad04aaa2e
2015-07-01 15:44:32 +00:00
Geoff Mendal
85a71d6a62 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-01 15:42:33 +00:00
Geoff Mendal
f3bcb99430 Import translations. DO NOT MERGE
Change-Id: Ibe88fd3db790a357712803481a4a3dc2befe22cc
Auto-generated-cl: translation import
2015-07-01 07:52:03 -07:00
Jason Monk
f7806581e5 Avoid crashing
Bug: 22202631
Change-Id: I1980f77ae4300dbd19d6829dc5974bab0b88d612
2015-07-01 10:36:30 -04:00
Avish Shah
ad1f28cde0 Device Discoverability not set properly when Bluetooth is toggled
Issue:
When BT is turned off/on staying in the same BT Settings
screen discoverability was not set again.

Fix:
Handle setting discoverability Bluetooth state change
intents also when BT state is  turned ON.

Bug: 21944289
Change-Id: Ic3c8d476c53673b21d40ea2bd9669758d89c2aee
2015-07-01 01:35:29 +00:00
Adam Lesinski
09948d4804 am 56594c6d: Update FakeUid to implement new method defined in BatteryStats.Uid
* commit '56594c6d61c63d6cab28b32f431f6f0d9c84af91':
  Update FakeUid to implement new method defined in BatteryStats.Uid
2015-07-01 00:53:08 +00:00