Robin Lee
243a53cd6e
am a0c850f2: am d81d249a: am e46e4827: am 64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
...
* commit 'a0c850f24930ce6ad240e2a12aaf8ad020a7c561':
Restore Vpn advanced options on re-init or rotate
2015-07-08 17:07:36 +00:00
Robin Lee
d81d249af4
am e46e4827: am 64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
...
* commit 'e46e48271aacbe3278acb0dc52b439da1c3ec8e9':
Restore Vpn advanced options on re-init or rotate
2015-07-08 16:40:44 +00:00
Robin Lee
64e1e15d10
Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
2015-07-08 16:17:23 +00:00
Jason Monk
d355c89358
am 90c48a41: am e14fc96a: am fa10637f: am 4652115f: Merge "Handle uninstall from notifications list" into mnc-dev
...
* commit '90c48a4134af1c654c975369f00e497799fece38':
Handle uninstall from notifications list
2015-07-08 14:27:28 +00:00
Jason Monk
e14fc96a9c
am fa10637f: am 4652115f: Merge "Handle uninstall from notifications list" into mnc-dev
...
* commit 'fa10637f2b42ba0d4cc81e6bb0f0a13eaf335e79':
Handle uninstall from notifications list
2015-07-08 13:57:40 +00:00
Jason Monk
4652115f1f
Merge "Handle uninstall from notifications list" into mnc-dev
2015-07-08 13:34:41 +00:00
Zoltan Szatmary-Ban
87e918cdf0
am 2f279c3a: am 2cd50c45: am 03b73068: am 296e0aff: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
...
* commit '2f279c3a12e58806d8efb48bbeef031842a0ed80':
Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
2015-07-08 12:55:35 +00:00
Zoltan Szatmary-Ban
8eade69d74
am 89be2eea: am 38a510df: am 215af288: am 461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev
...
* commit '89be2eeab0738e7db8d945ff1267dc9bf8fdaeb2':
Making Settings > Storage multiprofile aware
2015-07-08 12:55:10 +00:00
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
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
461a48bac9
Merge "Making Settings > Storage multiprofile aware" into mnc-dev
2015-07-08 10:54:19 +00:00
Wei Liu
d5e276fa6e
am 27e39542: am e0021c42: Move NetworkPolicyEditor from Settings packge to settingslib.
...
* commit '27e395427eef95fea47f06b5cc7bbba0e7853016':
Move NetworkPolicyEditor from Settings packge to settingslib.
2015-07-08 01:40:05 +00:00
Christopher Tate
0556a0a949
am 6c444a03: am d0528b69: am fe71156d: am 8023385e: Merge "App link handling is not just for "official" verified handlers" into mnc-dev
...
* commit '6c444a03f671eb4439792506f09efe8b6b3fdb59':
App link handling is not just for "official" verified handlers
2015-07-08 01:39:59 +00:00
Amith Yamasani
4a902ffd0b
am 0531c255: am 8a62bf97: am 8e9aca37: am 7ac21204: Merge "Use localized name for guest user" into mnc-dev
...
* commit '0531c255e6d00498e06811f032744b40fc453e80':
Use localized name for guest user
2015-07-08 01:36:49 +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
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
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
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
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
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
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
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
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
b8b20a5032
Merge "Fix USB mode development setting" into mnc-dev
2015-07-01 19:13:44 +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
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
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
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
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
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
a5dc01a2b1
am f1d70b5f: am a8af51b2: Merge "Handle adjust volume user restriction" into mnc-dev
...
* commit 'f1d70b5f7da3929afbc27494539c8e1bbafd77c4':
Handle adjust volume user restriction
2015-06-30 21:22:35 +00: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
86826083b6
am 3ff8ce1d: am a2bd2eac: Merge "Make sure Fragments are public for FragMan to instantiate" into mnc-dev
...
* commit '3ff8ce1d9de9efcf88981f6c9b4b63497be8ae7f':
Make sure Fragments are public for FragMan to instantiate
2015-06-30 17:28:37 +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