Zoltan Szatmary-Ban
2cd50c45da
am 03b73068
: am 296e0aff
: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
...
* commit '03b73068128807b4308185d04ab4688e71e02000':
Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
2015-07-08 12:12:30 +00:00
Zoltan Szatmary-Ban
03b7306812
am 296e0aff
: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
...
* commit '296e0aff022196ef2fec934878d8721828bea3f1':
Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
2015-07-08 11:57:34 +00:00
Zoltan Szatmary-Ban
296e0aff02
Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
2015-07-08 11:45:04 +00:00
Zoltan Szatmary-Ban
38a510df76
am 215af288
: am 461a48ba
: Merge "Making Settings > Storage multiprofile aware" into mnc-dev
...
* commit '215af288957eb64235af7a67af2143d1caf37428':
Making Settings > Storage multiprofile aware
2015-07-08 11:25:44 +00:00
Zoltan Szatmary-Ban
215af28895
am 461a48ba
: Merge "Making Settings > Storage multiprofile aware" into mnc-dev
...
* commit '461a48bac97c24706fd3b2f789648f61a42def42':
Making Settings > Storage multiprofile aware
2015-07-08 11:10:45 +00:00
Zoltan Szatmary-Ban
461a48bac9
Merge "Making Settings > Storage multiprofile aware" into mnc-dev
2015-07-08 10:54:19 +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
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
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
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
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
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
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
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
5b45c3cb2f
Fix build
...
Change-Id: I658528a9b0a8a281a2b30b2915c1be6963759378
2015-07-01 18:33:32 -07:00
Marco Nelissen
b8b20a5032
Merge "Fix USB mode development setting" into mnc-dev
2015-07-01 19:13:44 +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
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
fba915be16
Merge "Merge dex2oat with app being installed" into mnc-dev
2015-06-30 23:16:23 +00:00
Amith Yamasani
a8c4db48c2
Merge "Only allow admin users to adopt sd card as internal storage." into mnc-dev
2015-06-30 23:00:28 +00:00
Amith Yamasani
350274040e
Only allow admin users to adopt sd card as internal storage.
...
Bug: 21883016
Change-Id: I11ca324ab74ce2a8bf13064b4c7735aea132c562
2015-06-30 14:23:54 -07:00
Jason Monk
a8af51b2d8
Merge "Handle adjust volume user restriction" into mnc-dev
2015-06-30 20:08:15 +00:00
Jason Monk
72965ad53b
Handle adjust volume user restriction
...
- Finish all do not disturb pages immediately
- Disable relevant items in Sounds & notification
Bug: 21642285
Change-Id: I8de9bd10b8cea8adaa306b1ae388ab7d1ccc4e7e
2015-06-30 19:21:10 +00:00
Makoto Onuki
a2bd2eacc3
Merge "Make sure Fragments are public for FragMan to instantiate" into mnc-dev
2015-06-30 16:40:58 +00:00
Jason Monk
e6a0bee557
Merge "Fix crash in ignore optimizations dialog" into mnc-dev
2015-06-30 14:20:58 +00:00
Jason Monk
d5884c5023
Fix crash in ignore optimizations dialog
...
Launch it like a dialog, because it is one.
Bug: 22181580
Change-Id: Ibeda8506cfb7a9a9d60f70462a4e03972b38f8aa
2015-06-30 10:17:25 -04:00
Rubin Xu
02c7e95fd4
Merge "No longer use ExternalStorageFormatter to format external storage" into mnc-dev
2015-06-30 14:05:32 +00:00