OSDN Git Service
Victor Chang [Fri, 6 May 2016 03:08:21 +0000 (03:08 +0000)]
Merge "TrustCredentials listview should be expanded by default"
pkanwar [Fri, 6 May 2016 02:05:43 +0000 (02:05 +0000)]
resolve merge conflicts of
de67e0b to nyc-mr1-dev-plus-aosp
am:
7fe0c25f77
* commit '
7fe0c25f77e30c63eb486ae340ff8b1ce82c190c':
The "device type" icons in "Bluetooth device list" screen are not accessible to TalkBack users.
Change-Id: I0f4c21c20d921d9f239b6a4aa3352d9fb76280c8
pkanwar [Fri, 6 May 2016 01:53:08 +0000 (18:53 -0700)]
resolve merge conflicts of
de67e0b to nyc-mr1-dev-plus-aosp
Change-Id: I9213ec0dc937bd20ff705f4deb41c10a4e69c227
pkanwar [Thu, 5 May 2016 20:46:17 +0000 (20:46 +0000)]
The "device type" icons in "Bluetooth device list" screen are not accessible to TalkBack users.
am:
8fa3d44596
* commit '
8fa3d44596e75cbc03f1eb5b478133360227bc66':
The "device type" icons in "Bluetooth device list" screen are not accessible to TalkBack users.
Change-Id: I7c3223eb2909f46b961c57f0321ffeb758b52547
Maurice Lam [Thu, 5 May 2016 20:36:08 +0000 (20:36 +0000)]
Merge "Don\'t draw divider under headers" into nyc-mr1-dev am:
02e8a0d477
am:
b4e93c2a83
* commit '
b4e93c2a83b4f933a931ede73f8df8f7964045d1':
Don't draw divider under headers
Change-Id: I3d784b9797d62a69cea7d7ed48f17fc0343b962b
Maurice Lam [Thu, 5 May 2016 20:31:11 +0000 (20:31 +0000)]
Merge "Don\'t draw divider under headers" into nyc-mr1-dev
am:
02e8a0d477
* commit '
02e8a0d4779f151e3e7d5aa08d6423295f4c9031':
Don't draw divider under headers
Change-Id: Iff646b0db3fd513130e1f7fb0d1de92dbaadfbd9
Maurice Lam [Thu, 5 May 2016 20:19:54 +0000 (20:19 +0000)]
Merge "Don't draw divider under headers" into nyc-mr1-dev
Fan Zhang [Thu, 5 May 2016 18:54:01 +0000 (18:54 +0000)]
Add estimate time under support options. am:
be61a14fcd
am:
e8fc10ff79
* commit '
e8fc10ff79a19aa8b7c303740ab4a26abd9db753':
Add estimate time under support options.
Change-Id: Ifd226f015b01cc5cb2537a7bac01231fa970ac09
Fan Zhang [Thu, 5 May 2016 18:49:39 +0000 (18:49 +0000)]
Add estimate time under support options.
am:
be61a14fcd
* commit '
be61a14fcd01f5d8ccc2cb1584cea48b52697ce6':
Add estimate time under support options.
Change-Id: I9f175ea6e0d2b58165d4544ce8fb712695f74db0
pkanwar [Sat, 30 Apr 2016 00:43:24 +0000 (17:43 -0700)]
The "device type" icons in "Bluetooth device list" screen are
not accessible to TalkBack users.
b/
28199679 Changed method to for setting the talk-back
attribute on "device type".
Change-Id: I63820d861ea1075195b98c82004ba95470448a53
Rachel Zhang [Thu, 5 May 2016 18:13:20 +0000 (18:13 +0000)]
Merge "Launch Help & Feedback" into nyc-mr1-dev am:
1529a875db
am:
bc250c382b
* commit '
bc250c382bbadf36fe20fa819d9722296fb08064':
Launch Help & Feedback
Change-Id: I568359105877d0b846874fb20fe7a763a124cac5
Rachel Zhang [Thu, 5 May 2016 18:08:30 +0000 (18:08 +0000)]
Merge "Launch Help & Feedback" into nyc-mr1-dev
am:
1529a875db
* commit '
1529a875db917b4937ab37177d50e95c37b6d54c':
Launch Help & Feedback
Change-Id: If5e8c0fee1ee11968f40933eca254cada8d91189
Fan Zhang [Tue, 3 May 2016 00:25:05 +0000 (17:25 -0700)]
Add estimate time under support options.
Bug:
28141203
- SupportFeatureProvider will provide a localized estimate string.
- Use a builder pattern to instantiate SupportData to avoid increasing
constructor args.
Change-Id: I92e90cd57b4ef4e1d921f403801cfd5984ef6a3b
Rachel Zhang [Thu, 5 May 2016 17:58:13 +0000 (17:58 +0000)]
Merge "Launch Help & Feedback" into nyc-mr1-dev
Abodunrinwa Toki [Thu, 5 May 2016 16:56:07 +0000 (16:56 +0000)]
Merge "Merge "InputSettings: Define order of items in Physical keyboards screen." into nyc-dev am:
56f7bc44a1 am:
48bd6631af" into nyc-mr1-dev-plus-aosp
am:
4f9d0c95c5
* commit '
4f9d0c95c520abe8f17b4f17955fa9241fcea16c':
Change-Id: Ib1aceef944bb460502a0f424581093704793aec6
Abodunrinwa Toki [Thu, 5 May 2016 16:56:05 +0000 (16:56 +0000)]
Merge "InputSettings: Define order of items in Physical keyboards screen." into nyc-dev am:
56f7bc44a1 am:
a1e8cd1163
am:
8d04317a27
* commit '
8d04317a2751f32929b978ff194042172b9b2e62':
InputSettings: Define order of items in Physical keyboards screen.
Change-Id: I1308a8fa4cdf7e698d42c10a9d5a2aa92ffa9d4c
Android Build Merger (Role) [Thu, 5 May 2016 16:50:43 +0000 (16:50 +0000)]
Merge "Merge "InputSettings: Define order of items in Physical keyboards screen." into nyc-dev am:
56f7bc44a1 am:
48bd6631af" into nyc-mr1-dev-plus-aosp
Abodunrinwa Toki [Thu, 5 May 2016 16:50:33 +0000 (16:50 +0000)]
Merge "InputSettings: Define order of items in Physical keyboards screen." into nyc-dev am:
56f7bc44a1
am:
48bd6631af
* commit '
48bd6631afd8ca7c64dc23afa2d694b18932c127':
InputSettings: Define order of items in Physical keyboards screen.
Change-Id: Icfc795b0473b21af94f5cf0e17f598fc95568ce6
Abodunrinwa Toki [Thu, 5 May 2016 16:50:32 +0000 (16:50 +0000)]
Merge "InputSettings: Define order of items in Physical keyboards screen." into nyc-dev am:
56f7bc44a1
am:
a1e8cd1163
* commit '
a1e8cd1163d93f69d8d92c723afbfac631a0787e':
InputSettings: Define order of items in Physical keyboards screen.
Change-Id: I7c89dda0d0846fd316edcc92a773bfdd0e65129c
Abodunrinwa Toki [Thu, 5 May 2016 16:46:48 +0000 (16:46 +0000)]
Merge "InputSettings: Define order of items in Physical keyboards screen." into nyc-dev
am:
56f7bc44a1
* commit '
56f7bc44a1d6474e1ce6b9631cdd8087f1577490':
InputSettings: Define order of items in Physical keyboards screen.
Change-Id: Ib08f573cfaee03892e6366425ed0610286ee9445
Abodunrinwa Toki [Thu, 5 May 2016 16:46:48 +0000 (16:46 +0000)]
Merge "InputSettings: Define order of items in Physical keyboards screen." into nyc-dev
am:
56f7bc44a1
* commit '
56f7bc44a1d6474e1ce6b9631cdd8087f1577490':
InputSettings: Define order of items in Physical keyboards screen.
Change-Id: If981f9c6d29aaaaf9c1667e930a10fc1f1c82419
Abodunrinwa Toki [Thu, 5 May 2016 16:40:57 +0000 (16:40 +0000)]
Merge "InputSettings: Define order of items in Physical keyboards screen." into nyc-dev
Jason Monk [Thu, 5 May 2016 16:01:54 +0000 (16:01 +0000)]
Merge "Don\'t crash on non-app data usage" into nyc-dev am:
d1a4e452ed am:
1c06aedc3f
am:
aa91cfe46b
* commit '
aa91cfe46b5f27ab48d8f30e48694b83fed07315':
Change-Id: I62f5cd7a332b230af5bc61d897d0818a9b7cc02d
Jason Monk [Thu, 5 May 2016 16:01:53 +0000 (16:01 +0000)]
Merge "Fix cell data limit dialog title" into nyc-dev am:
2a6bc40d49 am:
0c7d11fe56
am:
abbea55388
* commit '
abbea5538832678aaf44e07683a7c80e2c405972':
Change-Id: I610dc416f01ff76675b227558f1b276475de7c66
Jason Monk [Thu, 5 May 2016 16:01:52 +0000 (16:01 +0000)]
Merge "Don\'t crash on non-app data usage" into nyc-dev am:
d1a4e452ed am:
9c38c20900
am:
6a0f1d6997
* commit '
6a0f1d69975b475fdaabc4b46286abb37be5ab91':
Don't crash on non-app data usage
Change-Id: If2678c2ef35d437b85b8fa1c8e125b39ea61cfed
Jason Monk [Thu, 5 May 2016 16:01:50 +0000 (16:01 +0000)]
Merge "Fix cell data limit dialog title" into nyc-dev am:
2a6bc40d49 am:
6f71ed9dbb
am:
ce1fa74716
* commit '
ce1fa7471648daac5abe5d3d322de3798ab8aea9':
Fix cell data limit dialog title
Change-Id: I4f337ad301b16edc173ff903d5105075b36782a2
Jason Monk [Thu, 5 May 2016 15:55:53 +0000 (15:55 +0000)]
Merge "Don\'t crash on non-app data usage" into nyc-dev am:
d1a4e452ed
am:
1c06aedc3f
* commit '
1c06aedc3fb8a973ae14fe3793bc239d3df862eb':
Change-Id: Ief5cbe7214d1d4f3af477acffde314c9bacfc386
Jason Monk [Thu, 5 May 2016 15:55:52 +0000 (15:55 +0000)]
Merge "Fix cell data limit dialog title" into nyc-dev am:
2a6bc40d49
am:
0c7d11fe56
* commit '
0c7d11fe568ec258165f6b94b916c72a533b09d7':
Change-Id: Ie21f67d2295be1e208a8e0cbbb14742afe3900d5
Jason Monk [Thu, 5 May 2016 15:53:25 +0000 (15:53 +0000)]
Merge "Don\'t crash on non-app data usage" into nyc-dev am:
d1a4e452ed
am:
9c38c20900
* commit '
9c38c209001d0151bc4e58a2b5c8f95bfb2d1cc4':
Don't crash on non-app data usage
Change-Id: If07b3e928a6daabfdfb82144211f4e2996ec2b87
Jason Monk [Thu, 5 May 2016 15:53:24 +0000 (15:53 +0000)]
Merge "Fix cell data limit dialog title" into nyc-dev am:
2a6bc40d49
am:
6f71ed9dbb
* commit '
6f71ed9dbb92fae8bcd4aa32000f656f7efd8467':
Fix cell data limit dialog title
Change-Id: I480483e8a259c0c8ebfea79f82dbd09a30e44093
Jason Monk [Thu, 5 May 2016 15:47:54 +0000 (15:47 +0000)]
Merge "Don\'t crash on non-app data usage" into nyc-dev
am:
d1a4e452ed
* commit '
d1a4e452ed659f4f52b0b72f54da1100c6b1f512':
Don't crash on non-app data usage
Change-Id: I46b35f11555442c2b7e1301d1dec8ee95807f36c
Jason Monk [Thu, 5 May 2016 15:47:54 +0000 (15:47 +0000)]
Merge "Fix cell data limit dialog title" into nyc-dev
am:
2a6bc40d49
* commit '
2a6bc40d497d1bc0fdfc9cc86bc4db72791909b7':
Fix cell data limit dialog title
Change-Id: Ia087f0ace8cb1f9a3c93ced1b3500207b6d63cf4
Jason Monk [Thu, 5 May 2016 15:47:50 +0000 (15:47 +0000)]
Merge "Don\'t crash on non-app data usage" into nyc-dev
am:
d1a4e452ed
* commit '
d1a4e452ed659f4f52b0b72f54da1100c6b1f512':
Don't crash on non-app data usage
Change-Id: Ia43d98b016a2786dc5ad22e8f2a013b09bcff83d
Jason Monk [Thu, 5 May 2016 15:47:50 +0000 (15:47 +0000)]
Merge "Fix cell data limit dialog title" into nyc-dev
am:
2a6bc40d49
* commit '
2a6bc40d497d1bc0fdfc9cc86bc4db72791909b7':
Fix cell data limit dialog title
Change-Id: Ief4e72d16cb49592c08e284ec14af383125f7ae8
Jason Monk [Thu, 5 May 2016 15:41:17 +0000 (15:41 +0000)]
Merge "Don't crash on non-app data usage" into nyc-dev
Jason Monk [Thu, 5 May 2016 15:40:50 +0000 (15:40 +0000)]
Merge "Fix cell data limit dialog title" into nyc-dev
Tony Mak [Thu, 5 May 2016 14:02:04 +0000 (14:02 +0000)]
Merge "Merge "Should forward the intent even if its activity is disabled in Settings" into nyc-dev am:
de4b51c8ce am:
ce2201a04c" into nyc-mr1-dev-plus-aosp
am:
7d72db5f7d
* commit '
7d72db5f7de69b2b5afec968a743e194855cdaad':
Change-Id: I75939e3d47fa5e137556c752253699ea6fd62955
Tony Mak [Thu, 5 May 2016 14:02:03 +0000 (14:02 +0000)]
Merge "Should forward the intent even if its activity is disabled in Settings" into nyc-dev am:
de4b51c8ce am:
a428e704e0
am:
6f1bc8a28e
* commit '
6f1bc8a28ecf769fcc0208e5e5d13c32ebeac98a':
Should forward the intent even if its activity is disabled in Settings
Change-Id: I08a99bd1b013174ef83fb109e1bc38fcf8ffc419
Android Build Merger (Role) [Thu, 5 May 2016 13:59:47 +0000 (13:59 +0000)]
Merge "Merge "Should forward the intent even if its activity is disabled in Settings" into nyc-dev am:
de4b51c8ce am:
ce2201a04c" into nyc-mr1-dev-plus-aosp
Tony Mak [Thu, 5 May 2016 13:59:34 +0000 (13:59 +0000)]
Merge "Should forward the intent even if its activity is disabled in Settings" into nyc-dev am:
de4b51c8ce
am:
a428e704e0
* commit '
a428e704e02499321b7b3b4393659394973a85e7':
Should forward the intent even if its activity is disabled in Settings
Change-Id: Ia82393fcebaa31b788d3af98291a4a7628f59787
Tony Mak [Thu, 5 May 2016 13:59:34 +0000 (13:59 +0000)]
Merge "Should forward the intent even if its activity is disabled in Settings" into nyc-dev am:
de4b51c8ce
am:
ce2201a04c
* commit '
ce2201a04c824fa8cc0376e786f511a2067b0a77':
Should forward the intent even if its activity is disabled in Settings
Change-Id: I3fc793f36f1440fa5c2a1adbd098fc451462b178
Tony Mak [Thu, 5 May 2016 13:57:03 +0000 (13:57 +0000)]
Merge "Should forward the intent even if its activity is disabled in Settings" into nyc-dev
am:
de4b51c8ce
* commit '
de4b51c8ce4d16ef086ad04532113a942b267f1a':
Should forward the intent even if its activity is disabled in Settings
Change-Id: Ifeee1ee85084aa668ca3f7083db80cdf4da3beb9
Tony Mak [Thu, 5 May 2016 13:57:03 +0000 (13:57 +0000)]
Merge "Should forward the intent even if its activity is disabled in Settings" into nyc-dev
am:
de4b51c8ce
* commit '
de4b51c8ce4d16ef086ad04532113a942b267f1a':
Should forward the intent even if its activity is disabled in Settings
Change-Id: I3f2c1ce85fc96f299b931a99036f72e1e2478bd8
Tony Mak [Thu, 5 May 2016 13:50:09 +0000 (13:50 +0000)]
Merge "Should forward the intent even if its activity is disabled in Settings" into nyc-dev
Abodunrinwa Toki [Fri, 22 Apr 2016 16:45:03 +0000 (17:45 +0100)]
InputSettings: Define order of items in Physical keyboards screen.
Bug:
28158120
Change-Id: Ia7cec64edb9da53a2048865e317b2b9d4b2059b0
Victor Chang [Thu, 14 Apr 2016 21:51:38 +0000 (22:51 +0100)]
TrustCredentials listview should be expanded by default
UI Change for 2-profile case:
1. When both personal and work listview are expanded, half height is allocated for each list view
2. When only one listview is expanded, full height is allocated to the list view
Video can be found at go/trust-cred-split-view
- Use 2 ListView instead of 1 ExpandableListView in order to scoll the list independently
- The ui is not changed for only one or more than 3 profiles.
- Remove TrustedCertificateAdapterCommons, and wrap GroupAdapter by ChildAdapter in order to re-use more codes
- clear mAliasLoaders in onDestroy. (Seems it's a bug.)
- When work mode or fbe locked, force to collapse work list view. User message will be prompted when user press on header
- Groups in GroupAdapter is set synchronously instead of async, since we assume the number of users are fixed during initialization
- DataSet events will go through GroupAdapter to notifiy ChildAdapter
Bug:
28236955
Change-Id: Iebfcd3fcb6515b42687e133b11696c42db63d18f
Maurice Lam [Wed, 4 May 2016 22:24:58 +0000 (15:24 -0700)]
Don't draw divider under headers
Create SettingsDividerItemDecoration which reads PreferenceViewHolder
isDividerAllowedAbove/Below so that will be taken into account as
well as other ViewHolders which implements DividedViewHolder.
Bug:
28445348
Change-Id: I73e298f2ca1688b135e533a8d3ef5f5c154963f7
Philip P. Moltmann [Wed, 4 May 2016 22:22:33 +0000 (22:22 +0000)]
Merge "Do not set order for print services settings." into nyc-dev am:
de4e43edda am:
c43f32d331
am:
5833ba4869
* commit '
5833ba4869df93a60513eb8992efcad9b81f24b2':
Change-Id: Ic43792807f98fcbfd89138b07c0169494d3468ff
Robin Lee [Wed, 4 May 2016 22:22:32 +0000 (22:22 +0000)]
Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am:
662731fb55 am:
eb36dbea1f
am:
ee75357488
* commit '
ee753574885ec59b0948e1c85039e77fb4953eea':
Change-Id: I08db3c8957676a4a2c2cb924e6259629f00cda2d
Hyunyoung Song [Wed, 4 May 2016 22:22:30 +0000 (22:22 +0000)]
Merge "Add shortcut manager support to Settings (2/2) b/
28298258" into nyc-mr1-dev am:
5a3e547143
am:
8d75f22935
* commit '
8d75f229350f24e25d907b2ed973f14db26a833d':
Add shortcut manager support to Settings (2/2) b/
28298258
Change-Id: If888e8f269ad1d714dcbe2cfa05c84a41721847b
Philip P. Moltmann [Wed, 4 May 2016 22:22:28 +0000 (22:22 +0000)]
Merge "Do not set order for print services settings." into nyc-dev am:
de4e43edda am:
5cc5f2d70e
am:
58f93f1645
* commit '
58f93f1645f5a0714c46d8e40c5e2353ae52c3e6':
Do not set order for print services settings.
Change-Id: I7be3cfa303fd4ac2859c5da1603ad8a8d2c26f38
Robin Lee [Wed, 4 May 2016 22:22:26 +0000 (22:22 +0000)]
Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am:
662731fb55 am:
ed5f33740c
am:
6dd792e2cd
* commit '
6dd792e2cdd6ce2d674f9a7dcd1100a04e6d1318':
Add lockdownEnabled parameter to always-on VPN API
Change-Id: Ie610dee2521fd4e4b1caa986efa866100f6c929c
Philip P. Moltmann [Wed, 4 May 2016 21:51:31 +0000 (21:51 +0000)]
Merge "Do not set order for print services settings." into nyc-dev am:
de4e43edda
am:
c43f32d331
* commit '
c43f32d33113d583af3afdd69661a1ff8e56d378':
Change-Id: I82ae791c4c275ebb704961efb204046431179de0
Robin Lee [Wed, 4 May 2016 21:51:30 +0000 (21:51 +0000)]
Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am:
662731fb55
am:
eb36dbea1f
* commit '
eb36dbea1ff194940c86efd61b2aa1131b96e0f3':
Change-Id: I26a94de28ba124025d9500459c6e134e137681e9
Hyunyoung Song [Wed, 4 May 2016 21:49:47 +0000 (21:49 +0000)]
Merge "Add shortcut manager support to Settings (2/2) b/
28298258" into nyc-mr1-dev
am:
5a3e547143
* commit '
5a3e5471430d00892beb05ec55dc466c2039a36a':
Add shortcut manager support to Settings (2/2) b/
28298258
Change-Id: I88f02a0d70880f171d742b3fe0652f21baf25a70
Philip P. Moltmann [Wed, 4 May 2016 21:49:46 +0000 (21:49 +0000)]
Merge "Do not set order for print services settings." into nyc-dev am:
de4e43edda
am:
5cc5f2d70e
* commit '
5cc5f2d70eaa51ad2c7577e923e2350ed5642d4a':
Do not set order for print services settings.
Change-Id: I5a457d0b2f81121f74b70a5981510becf99b49ca
Robin Lee [Wed, 4 May 2016 21:49:45 +0000 (21:49 +0000)]
Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am:
662731fb55
am:
ed5f33740c
* commit '
ed5f33740cf0305cd723f4a5415423bf5fa969c4':
Add lockdownEnabled parameter to always-on VPN API
Change-Id: I3d924e1e8dd69c2392cd09d8c048de7d96b01f40
Hyunyoung Song [Wed, 4 May 2016 20:43:08 +0000 (20:43 +0000)]
Merge "Add shortcut manager support to Settings (2/2) b/
28298258" into nyc-mr1-dev
Jason Monk [Wed, 4 May 2016 19:46:05 +0000 (15:46 -0400)]
Fix cell data limit dialog title
Change-Id: I0303bc74bb7b0e46ed020d255baf2465c7db0fc5
Fixes:
27604216
Philip P. Moltmann [Wed, 4 May 2016 19:19:06 +0000 (19:19 +0000)]
Merge "Do not set order for print services settings." into nyc-dev
am:
de4e43edda
* commit '
de4e43eddae70b63671083fd6fc95de7df1ed2fd':
Do not set order for print services settings.
Change-Id: Ibca759a4db12c5edb913711344a860cff75022ee
Philip P. Moltmann [Wed, 4 May 2016 19:19:06 +0000 (19:19 +0000)]
Merge "Do not set order for print services settings." into nyc-dev
am:
de4e43edda
* commit '
de4e43eddae70b63671083fd6fc95de7df1ed2fd':
Do not set order for print services settings.
Change-Id: Icb3b9ca85af76635eb64a60a45cd91fc13ab7bb1
Philip P. Moltmann [Wed, 4 May 2016 19:08:48 +0000 (19:08 +0000)]
Merge "Do not set order for print services settings." into nyc-dev
Robin Lee [Wed, 4 May 2016 18:58:17 +0000 (18:58 +0000)]
Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev
am:
662731fb55
* commit '
662731fb55971cb81d52dd611075c7a5df5eb023':
Add lockdownEnabled parameter to always-on VPN API
Change-Id: I843e1e6da26237465dd054267a1031d7e38bdbc0
Robin Lee [Wed, 4 May 2016 18:54:52 +0000 (18:54 +0000)]
Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev
am:
662731fb55
* commit '
662731fb55971cb81d52dd611075c7a5df5eb023':
Add lockdownEnabled parameter to always-on VPN API
Change-Id: I0730abfe3c7cbec60f3961f5c9d8e111c2e8a5ac
Hyunyoung Song [Wed, 4 May 2016 17:49:59 +0000 (10:49 -0700)]
Add shortcut manager support to Settings (2/2)
b/
28298258
Locale change will be handled in future CL/ dynamic shortcut list
change using a UI will be handled in follow up CL.
Change-Id: I5468b17e8c8b32625139ab0484d5d0386be0961d
Fan Zhang [Wed, 4 May 2016 18:45:59 +0000 (18:45 +0000)]
Merge "Bring escalation options UI closer to mock." into nyc-mr1-dev am:
00b127b134
am:
aa21c1b07a
* commit '
aa21c1b07af088ac1d106ebad91016dd1fcc29ca':
Bring escalation options UI closer to mock.
Change-Id: I7519fa058e1be86af37527e8c1ff9c4476120f6d
Jeff Sharkey [Wed, 4 May 2016 18:45:41 +0000 (18:45 +0000)]
Merge "UX polish tweaks to FallbackHome." into nyc-dev am:
e50853f485 am:
6c2fccfabf
am:
ff74ebff5a
* commit '
ff74ebff5ad4368411b5641670363658ba8c2f9e':
Change-Id: I8332d866822d6acb457b2a63ef291ac66f0224bc
Jeff Sharkey [Wed, 4 May 2016 18:44:54 +0000 (18:44 +0000)]
Merge "UX polish tweaks to FallbackHome." into nyc-dev am:
e50853f485 am:
0d613ab2cf
am:
6bb1f8146b
* commit '
6bb1f8146b048110be3e25fdafe2d8045abaaae6':
UX polish tweaks to FallbackHome.
Change-Id: I882caf4bc033a801936fa4321a99360b26abc29d
Robin Lee [Wed, 4 May 2016 18:38:28 +0000 (18:38 +0000)]
Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev
Fan Zhang [Wed, 4 May 2016 18:03:42 +0000 (18:03 +0000)]
Merge "Bring escalation options UI closer to mock." into nyc-mr1-dev
am:
00b127b134
* commit '
00b127b134ff41ea14ec56fdd33c076e1ccffc1c':
Bring escalation options UI closer to mock.
Change-Id: I4e97594c7ea9d5c70f0629fae2c0f894a3fbab08
Jeff Sharkey [Wed, 4 May 2016 18:03:29 +0000 (18:03 +0000)]
Merge "UX polish tweaks to FallbackHome." into nyc-dev am:
e50853f485
am:
6c2fccfabf
* commit '
6c2fccfabfd3faf30d9e646a133e058096f39a7b':
Change-Id: I560d0fd886b79ae1f6556ce20a19e8807d03cc52
Jeff Sharkey [Wed, 4 May 2016 18:00:35 +0000 (18:00 +0000)]
Merge "UX polish tweaks to FallbackHome." into nyc-dev am:
e50853f485
am:
0d613ab2cf
* commit '
0d613ab2cf31d9a6608e5cf4b7e0f5e82ae89969':
UX polish tweaks to FallbackHome.
Change-Id: Ib6ef02d4a2f073b12b4079af82569489585fab93
Fan Zhang [Wed, 4 May 2016 17:47:17 +0000 (17:47 +0000)]
Merge "Bring escalation options UI closer to mock." into nyc-mr1-dev
Jason Monk [Wed, 4 May 2016 17:43:26 +0000 (13:43 -0400)]
Don't crash on non-app data usage
Change-Id: Ib39fc280a892dea2e3e7cbe22339799ab51a6eca
Fixes:
28531037
Jeff Sharkey [Wed, 4 May 2016 17:34:56 +0000 (17:34 +0000)]
Merge "UX polish tweaks to FallbackHome." into nyc-dev
am:
e50853f485
* commit '
e50853f485fd99c14d6af8167b06fc0c5ae19a22':
UX polish tweaks to FallbackHome.
Change-Id: I392867952c277fea71ab86389ed6df1e5e483b20
Jeff Sharkey [Wed, 4 May 2016 17:34:55 +0000 (17:34 +0000)]
Merge "UX polish tweaks to FallbackHome." into nyc-dev
am:
e50853f485
* commit '
e50853f485fd99c14d6af8167b06fc0c5ae19a22':
UX polish tweaks to FallbackHome.
Change-Id: I9fc3f4df1333e6e17bb7aa809f2a8a822697b616
TreeHugger Robot [Wed, 4 May 2016 17:13:16 +0000 (17:13 +0000)]
Merge "UX polish tweaks to FallbackHome." into nyc-dev
Philip P. Moltmann [Wed, 4 May 2016 16:44:01 +0000 (09:44 -0700)]
Do not set order for print services settings.
What happened before was that negative number turned out to be order
behind ORDER_LAST.
Change-Id: I714f623a2b1be06dde86ae7f36b39c64006203f2
Daniel Nishi [Wed, 4 May 2016 16:41:52 +0000 (16:41 +0000)]
Merge "Fix a bug where negative file sizes were being used." into nyc-mr1-dev am:
38cdbf7fdc
am:
f2ea09f405
* commit '
f2ea09f40534e65d23126964b90ba1d405ab0f1b':
Fix a bug where negative file sizes were being used.
Change-Id: Ib73852cdb85368df7b32fcdca5bbb1aa62a83c8f
Daniel Nishi [Wed, 4 May 2016 16:31:26 +0000 (16:31 +0000)]
Merge "Fix a bug where negative file sizes were being used." into nyc-mr1-dev
am:
38cdbf7fdc
* commit '
38cdbf7fdced67563f26c334dfa6c5dcf78eaecc':
Fix a bug where negative file sizes were being used.
Change-Id: I177311d921c89f30545080b2fec73f95f81a30ef
Daniel Nishi [Wed, 4 May 2016 16:13:24 +0000 (16:13 +0000)]
Merge "Fix a bug where negative file sizes were being used." into nyc-mr1-dev
Fan Zhang [Thu, 28 Apr 2016 22:20:09 +0000 (15:20 -0700)]
Bring escalation options UI closer to mock.
Bug:
28141203
Change-Id: Ia6d50d7d6f3010695c62fc1e8bd07f858715e455
Mahaver Chopra [Wed, 4 May 2016 14:45:04 +0000 (14:45 +0000)]
Merge "Merge "More informative title while choosing work lock." into nyc-dev am:
9efcb2e314 am:
49a3cc0fb6" into nyc-mr1-dev-plus-aosp
am:
3d028b1de2
* commit '
3d028b1de28ae324071e8d3c2567fb44514914e6':
Change-Id: I0bce4b9a3a7a9738f200fd98455a2a6ec34ab154
Mahaver Chopra [Wed, 4 May 2016 14:45:01 +0000 (14:45 +0000)]
Merge "More informative title while choosing work lock." into nyc-dev am:
9efcb2e314 am:
b735c1baf7
am:
1ebe441ae2
* commit '
1ebe441ae2d35579705e79b63ece3dab6a045962':
More informative title while choosing work lock.
Change-Id: I29a0a8e613954716b09746b4b15328fd9c184d38
Android Build Merger (Role) [Wed, 4 May 2016 14:32:11 +0000 (14:32 +0000)]
Merge "Merge "More informative title while choosing work lock." into nyc-dev am:
9efcb2e314 am:
49a3cc0fb6" into nyc-mr1-dev-plus-aosp
Mahaver Chopra [Wed, 4 May 2016 14:31:56 +0000 (14:31 +0000)]
Merge "More informative title while choosing work lock." into nyc-dev am:
9efcb2e314
am:
49a3cc0fb6
* commit '
49a3cc0fb683f28e907fdf7c72a21bffb6af43a8':
More informative title while choosing work lock.
Change-Id: Ic463aa2e0c3640f5d22217837aa106be28e51523
Mahaver Chopra [Wed, 4 May 2016 14:31:53 +0000 (14:31 +0000)]
Merge "More informative title while choosing work lock." into nyc-dev am:
9efcb2e314
am:
b735c1baf7
* commit '
b735c1baf7affe1bc26ce6be3abe605026f828e2':
More informative title while choosing work lock.
Change-Id: I56a16ff55bf5c84ccecafb1f6e8d958fbe0890b0
Mahaver Chopra [Wed, 4 May 2016 14:22:27 +0000 (14:22 +0000)]
Merge "More informative title while choosing work lock." into nyc-dev
am:
9efcb2e314
* commit '
9efcb2e314f4c31de26cea629b03b436f7b84df1':
More informative title while choosing work lock.
Change-Id: I38dce28a33ac847cba1f256d99ec2a0f092d5b4c
Mahaver Chopra [Wed, 4 May 2016 14:22:27 +0000 (14:22 +0000)]
Merge "More informative title while choosing work lock." into nyc-dev
am:
9efcb2e314
* commit '
9efcb2e314f4c31de26cea629b03b436f7b84df1':
More informative title while choosing work lock.
Change-Id: Ib71598d4112cb10392fa32cc39aa10699ad6855e
Mahaver Chopra [Wed, 4 May 2016 14:03:08 +0000 (14:03 +0000)]
Merge "More informative title while choosing work lock." into nyc-dev
Nicolas Prevot [Wed, 4 May 2016 13:08:37 +0000 (13:08 +0000)]
Merge "Only ask for credentials in add account if user is locked." into nyc-dev am:
832c8e4fda am:
0eab365289
am:
d9699c254d
* commit '
d9699c254ddffbf5f396fbc7f9506c541c7ae495':
Change-Id: I182a9fb03c4d65917bbe379e4a174310fbf2ac2a
Nicolas Prevot [Wed, 4 May 2016 13:08:32 +0000 (13:08 +0000)]
Merge "Only ask for credentials in add account if user is locked." into nyc-dev am:
832c8e4fda am:
d16c520451
am:
dc47ac730e
* commit '
dc47ac730ec5489989f922b9a8c9cdd2d452a9d1':
Only ask for credentials in add account if user is locked.
Change-Id: I3b4c678487222d68b209492897b960bbe9c142dd
Nicolas Prévot [Wed, 4 May 2016 13:05:24 +0000 (13:05 +0000)]
Merge "Only ask for credentials in add account if user is locked." into nyc-dev am:
832c8e4fda
am:
0eab365289
* commit '
0eab3652891460e3c4ce3582a14f682e5759fb55':
Change-Id: I84b70273827460caf65d04759eb06cf624579f1c
Nicolas Prévot [Wed, 4 May 2016 13:00:47 +0000 (13:00 +0000)]
Merge "Only ask for credentials in add account if user is locked." into nyc-dev am:
832c8e4fda
am:
d16c520451
* commit '
d16c52045150854da9efad21623b24d6c443b373':
Only ask for credentials in add account if user is locked.
Change-Id: Iaae924082368b59cec76b5720a604f4eb59f7deb
Nicolas Prevot [Wed, 4 May 2016 12:53:44 +0000 (12:53 +0000)]
Merge "Only ask for credentials in add account if user is locked." into nyc-dev
am:
832c8e4fda
* commit '
832c8e4fdadce8b8fd9b13fe584a7dfb0324d0a0':
Only ask for credentials in add account if user is locked.
Change-Id: Ieacd13cc6536fd789b76246de550c4592cfe4b57
Nicolas Prevot [Wed, 4 May 2016 12:53:36 +0000 (12:53 +0000)]
Merge "Only ask for credentials in add account if user is locked." into nyc-dev
am:
832c8e4fda
* commit '
832c8e4fdadce8b8fd9b13fe584a7dfb0324d0a0':
Only ask for credentials in add account if user is locked.
Change-Id: Ic93962179b1ce9ac19233810dbf065aedd662168
Tony Mak [Wed, 4 May 2016 12:51:41 +0000 (13:51 +0100)]
Should forward the intent even if its activity is disabled in Settings
This fixes the cross profile intent filter test in CtsVerifier.
Activities of action APPLICATION_DEVELOPMENT_SETTINGS and
NFC_PAYMENT_SETTINGS are disabled in managed profile. But we still
want their corresponding intents to be forwarded to personal side.
Bug:
28426865
Change-Id: I65afc06f7faf4532d9e132f44c1faa49f47d1a2e
Nicolas Prévot [Wed, 4 May 2016 12:43:31 +0000 (12:43 +0000)]
Merge "Only ask for credentials in add account if user is locked." into nyc-dev
Mahaver Chopra [Wed, 4 May 2016 12:11:17 +0000 (13:11 +0100)]
More informative title while choosing work lock.
When Intent ACTION_SET_NEW_PASSWORD is called from a managed profile,
ChooseLockGeneric fragment shows title "Unlock Selection", update that to
"Choose work lock".
Bug:
28451356
Change-Id: I9bcf4698557fa453337aa666f10f94f15e7624fa
Tony Mak [Wed, 4 May 2016 10:46:47 +0000 (10:46 +0000)]
Merge "Add managed profile setting page" into nyc-dev am:
d5b3a5d342 am:
b8cfa32bf1
am:
755dc9b1b5
* commit '
755dc9b1b5bfd811b394602ad8be9085f62ff550':
Change-Id: I2cfe1c1c504793bd71eadebdd70a34bc8fe8fb64
OSDN Git Service
