Wei Liu
27e395427e
am e0021c42
: Move NetworkPolicyEditor from Settings packge to settingslib.
...
* commit 'e0021c426c75ea8a737714f0b8bb27988ac3a51f':
Move NetworkPolicyEditor from Settings packge to settingslib.
2015-07-08 00:42:50 +00:00
Christopher Tate
6c444a03f6
am d0528b69
: am fe71156d
: am 8023385e
: Merge "App link handling is not just for "official" verified handlers" into mnc-dev
...
* commit 'd0528b69d4ad70fdad8e218e618cd875eef96f4f':
App link handling is not just for "official" verified handlers
2015-07-08 00:24:08 +00:00
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
Jorim Jaggi
2e57c997fe
am bbd59cc2
: am 21b05211
: am a0357604
: am 30001127
: am 2bd619d5
: Merge "Text changes to assist & voice input" into mnc-dev
...
* commit 'bbd59cc252ec037c5b385b2c1c74c39f00e27c49':
Text changes to assist & voice input
2015-07-07 00:32:56 +00:00
Jeff Sharkey
fa7c4905d4
am fe7cea03
: am 41e81016
: am fe015ffe
: am 355c13d2
: am 66b5a58a
: Merge "Fix init order so we have something to measure." into mnc-dev
...
* commit 'fe7cea03af1b5fca75a0e8931945c8e288a5d7ae':
Fix init order so we have something to measure.
2015-07-07 00:31:45 +00:00
Jeff Sharkey
d17921337d
am b126a4ea
: am 084dd048
: am fc963764
: am bdb64bf1
: am 7616b00b
: Merge changes from topic \'mig\' into mnc-dev
...
* commit 'b126a4ea4abffecd9580b1c56cde22f58e7f742d':
Fix some ordering, colors, and accessibility bugs.
Handle missing migration source volume.
2015-07-07 00:31:43 +00: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
bbd59cc252
am 21b05211
: am a0357604
: am 30001127
: am 2bd619d5
: Merge "Text changes to assist & voice input" into mnc-dev
...
* commit '21b05211955ed9646324eb5f1c1c6a48a596d355':
Text changes to assist & voice input
2015-07-06 22:32:41 +00: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
fe7cea03af
am 41e81016
: am fe015ffe
: am 355c13d2
: am 66b5a58a
: Merge "Fix init order so we have something to measure." into mnc-dev
...
* commit '41e81016f6a2720bf86268fd9562fa4b9654b619':
Fix init order so we have something to measure.
2015-07-06 19:18:52 +00:00
Jeff Sharkey
b126a4ea4a
am 084dd048
: am fc963764
: am bdb64bf1
: am 7616b00b
: Merge changes from topic \'mig\' into mnc-dev
...
* commit '084dd0487cc310e6aed81933a32d7f23b39797cf':
Fix some ordering, colors, and accessibility bugs.
Handle missing migration source volume.
2015-07-06 19:18:51 +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
bd1cebe4ab
am 7f39ae10
: (-s ours) am b9819796
: (-s ours) am 1c2260a1
: (-s ours) am c869c959
: (-s ours) am e21573da
: (-s ours) Import translations. DO NOT MERGE
...
* commit '7f39ae1030920ac3d3a2ae4c6cfa1fb028e988e9':
Import translations. DO NOT MERGE
2015-07-06 16:08:19 +00:00
Geoff Mendal
7f39ae1030
am b9819796
: (-s ours) am 1c2260a1
: (-s ours) am c869c959
: (-s ours) am e21573da
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b9819796dde4546b8a88983a7a8da810d16dd7d4':
Import translations. DO NOT MERGE
2015-07-06 15:53:50 +00: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
Geoff Mendal
750a1feed9
Import translations. DO NOT MERGE
...
Change-Id: Iaaba64c90d35db2817b0a889ab58b398b7f9d8b7
Auto-generated-cl: translation import
2015-07-06 07:13:18 -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
cec56e01be
am b3b15d24
: am bdfc2b0f
: am 5b45c3cb
: Fix build
...
* commit 'b3b15d24df2cde3b5a497d722c8ea2d7f9ef574a':
Fix build
2015-07-04 08:05:35 +00:00
Marco Nelissen
60fb6d201a
am a0918440
: am f35bd641
: am b8b20a50
: Merge "Fix USB mode development setting" into mnc-dev
...
* commit 'a0918440803bcfa1d28472d70dd0e37ca79814fb':
Fix USB mode development setting
2015-07-04 08:04:30 +00:00