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
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
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
b3b15d24df
am bdfc2b0f
: am 5b45c3cb
: Fix build
...
* commit 'bdfc2b0f9465f9683aa8a06443421166f5c9d398':
Fix build
2015-07-02 02:01:11 +00: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
a091844080
am f35bd641
: am b8b20a50
: Merge "Fix USB mode development setting" into mnc-dev
...
* commit 'f35bd64130ceb668a8fee544ef3b888f51d3eb14':
Fix USB mode development setting
2015-07-02 01:02:48 +00: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
5393ac0236
am ad44e83e
: (-s ours) am 85a71d6a
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'ad44e83e0acb043e7069f7761300ce265adc6ba0':
Import translations. DO NOT MERGE
2015-07-01 17:12:43 +00:00
Jason Monk
3988dd5a6b
am a6eca19a
: am f7806581
: Avoid crashing
...
* commit 'a6eca19ad15eb75588635f89dec1093c9eecffdf':
Avoid crashing
2015-07-01 17:12:42 +00:00
Avish Shah
bd17cc3560
am 76ffaaa2
: am ad1f28cd
: Device Discoverability not set properly when Bluetooth is toggled
...
* commit '76ffaaa238b20cc103e8a08a22d9db1f5990ccff':
Device Discoverability not set properly when Bluetooth is toggled
2015-07-01 17:12:41 +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
b285f018be
am 09948d48
: am 56594c6d
: Update FakeUid to implement new method defined in BatteryStats.Uid
...
* commit '09948d4804f34d76f8e0987efec7b313eb03e3ee':
Update FakeUid to implement new method defined in BatteryStats.Uid
2015-07-01 01:06:54 +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
Adam Lesinski
56594c6d61
Update FakeUid to implement new method defined in BatteryStats.Uid
...
Bug:21498425
Change-Id: I956c04d13daf985d472cc7ff2762ad74d5bb9502
2015-06-30 16:58:08 -07:00
Adam Lesinski
cce0d46de9
am 985d1029
: am fba915be
: Merge "Merge dex2oat with app being installed" into mnc-dev
...
* commit '985d10296a87fe3ffeeec18d51f9af8fc96588ed':
Merge dex2oat with app being installed
2015-06-30 23:40:59 +00:00
Adam Lesinski
985d10296a
am fba915be
: Merge "Merge dex2oat with app being installed" into mnc-dev
...
* commit 'fba915be162f5e32e1a614c5497ef08b216a5b3a':
Merge dex2oat with app being installed
2015-06-30 23:30:15 +00:00
Amith Yamasani
856bc3bd12
am 5bfbc07f
: am a8c4db48
: Merge "Only allow admin users to adopt sd card as internal storage." into mnc-dev
...
* commit '5bfbc07fc761009e2b4116d47d6bda7460061840':
Only allow admin users to adopt sd card as internal storage.
2015-06-30 23:26:32 +00:00
Adam Lesinski
fba915be16
Merge "Merge dex2oat with app being installed" into mnc-dev
2015-06-30 23:16:23 +00:00
Amith Yamasani
5bfbc07fc7
am a8c4db48
: Merge "Only allow admin users to adopt sd card as internal storage." into mnc-dev
...
* commit 'a8c4db48c26634836ade77f3f8f0403089245f9c':
Only allow admin users to adopt sd card as internal storage.
2015-06-30 23:13:51 +00:00