Philip P. Moltmann
b05fbfa274
Use changed getStatus interface
...
Change-Id: I72a2aa74607e34a1afbef0982f634def3e30efd4
2016-03-24 16:53:44 -07:00
Udam Saini
fc76f5ffd4
Merge "Updates spacing on redaction interstitial" into nyc-dev am: 375b981
...
am: f7e45a7
* commit 'f7e45a7f281a399ed373d6aac892d63941be33de':
Updates spacing on redaction interstitial
2016-03-24 22:45:00 +00:00
Julia Reynolds
f2f1272ac0
Merge "Rules without a configuration activity aren\'t clickable." into nyc-dev am: befc5c5
...
am: eb9dae0
* commit 'eb9dae04ab3a224f108d1911c09c9ed88c8678c9':
Rules without a configuration activity aren't clickable.
2016-03-24 22:44:59 +00:00
Udam Saini
f7e45a7f28
Merge "Updates spacing on redaction interstitial" into nyc-dev
...
am: 375b981
* commit '375b981267aea4f3fb3374d2a6e18339125dd455':
Updates spacing on redaction interstitial
2016-03-24 22:40:16 +00:00
Julia Reynolds
eb9dae04ab
Merge "Rules without a configuration activity aren\'t clickable." into nyc-dev
...
am: befc5c5
* commit 'befc5c59eb7e896ab5ec7df423f3b9eec8726f01':
Rules without a configuration activity aren't clickable.
2016-03-24 22:40:16 +00:00
Sudheer Shanka
4249d7589b
Fix crash in ApnSettings.
...
ApnSettings runs with uid android.uid.phone and since it doesn't has
the MANAGE_DEVICE_ADMINS and MANAGE_PROFILE_AND_DEVICE_OWNERS
permission, show the generic support instead of the admin specific
message.
Bug: 27826969
Change-Id: I556a8b74aa1f692ebac1f4e30aeab3ed78ec5078
2016-03-24 15:39:24 -07:00
Udam Saini
375b981267
Merge "Updates spacing on redaction interstitial" into nyc-dev
2016-03-24 22:20:10 +00:00
Julia Reynolds
befc5c59eb
Merge "Rules without a configuration activity aren't clickable." into nyc-dev
2016-03-24 22:11:53 +00:00
Julia Reynolds
2bcb0778c3
Rules without a configuration activity aren't clickable.
...
Bug: 27823109
Change-Id: Ifa2291627846e562f9a04ec1e85582833ab234de
2016-03-24 15:10:25 -07:00
Udam Saini
dd05ab7600
Changes SetupRedactionInterstitial to be an optional step
...
We no longer need this to be in inside the setup flow when setting up
the lock screen. Move this class to be used as an optional step if a
lock screen is added.
bug:23893721
Change-Id: I15478e0f0d8d8771cbdce6ccf0f508cbd5dd4f36
2016-03-24 15:08:19 -07:00
Sudheer Shanka
b51457db10
Fix crash in AndroidBeam class.
...
SwitchChangeListener is not added if admin disables the options, so
don't try to remove the listener in this case.
Bug: 27828118
Change-Id: Id0f9c71a10f93fc4c87af2b02ab7f04482145217
2016-03-24 12:21:45 -07:00
Robin Lee
ec4393953d
Merge "Implement action "android.settings.VPN_SETTINGS"" into nyc-dev am: 1997f76
...
am: 32c3be8
* commit '32c3be8e0392fd2f26ed505f52f048691628addd':
Implement action "android.settings.VPN_SETTINGS"
2016-03-24 18:44:46 +00:00
Robin Lee
32c3be8e03
Merge "Implement action "android.settings.VPN_SETTINGS"" into nyc-dev
...
am: 1997f76
* commit '1997f76cfc1ca3ee22d629db0504773f4f2abac3':
Implement action "android.settings.VPN_SETTINGS"
2016-03-24 18:41:16 +00:00
Robin Lee
1997f76cfc
Merge "Implement action "android.settings.VPN_SETTINGS"" into nyc-dev
2016-03-24 18:32:51 +00:00
Joe Onorato
b370a8d580
Adapt to procstats classes which moved.
...
Change-Id: I29a04ef3a3230f688ddf13e607a755b7d7f61991
2016-03-24 11:31:06 -07:00
Daniel U
4af1661bfb
Override device lock pattern visibility when unifying
...
Set to match Work profile pattern visibility when the user
chooses to use the same lock in Settings.
Bug: 27733223
Change-Id: I78be99d226ba906d124421ecf412178642128143
2016-03-24 17:57:56 +00:00
Hall Liu
b8eb4a1c55
Merge "Add indicator for system dialer in Settings" into nyc-dev am: f3dc18b
...
am: 736afac
* commit '736afac6cbfdc2f96fc074afbc6f25f5243fba42':
Add indicator for system dialer in Settings
2016-03-24 17:43:04 +00:00
Hall Liu
736afac6cb
Merge "Add indicator for system dialer in Settings" into nyc-dev
...
am: f3dc18b
* commit 'f3dc18b65bd78d7f00b6255208864cb6899674bc':
Add indicator for system dialer in Settings
2016-03-24 17:39:30 +00:00
Hall Liu
f3dc18b65b
Merge "Add indicator for system dialer in Settings" into nyc-dev
2016-03-24 17:29:39 +00:00
Fan Zhang
a2414963da
Merge "Don't return anything from setTitleFromBackStack."
2016-03-24 16:46:57 +00:00
Fan Zhang
2a7d1c3648
Don't return anything from setTitleFromBackStack.
...
The return value is not consumed by anything.
Change-Id: Id024ac02f00861aa1c7f347676c648ab406011b1
2016-03-24 09:33:43 -07:00
Robin Lee
d3041943a7
Implement action "android.settings.VPN_SETTINGS"
...
Bug: 27700919
Change-Id: Ibd23f1d53d40addc2ff8ac3215f3524b7e8c9c2e
2016-03-24 16:02:08 +00:00
Daichi Hirono
e73d3cfe67
Merge "Don\'t close USB type notification when USB is connected to USB devices." into nyc-dev am: 98607d4
...
am: 28fa685
* commit '28fa685ef3bdd1a5ea399172258bed15d97d1dbb':
Don't close USB type notification when USB is connected to USB devices.
2016-03-24 02:53:04 +00:00
Daichi Hirono
28fa685ef3
Merge "Don\'t close USB type notification when USB is connected to USB devices." into nyc-dev
...
am: 98607d4
* commit '98607d444903f5c74fe190f65800a5679b312c4e':
Don't close USB type notification when USB is connected to USB devices.
2016-03-24 02:50:52 +00:00
Daichi Hirono
98607d4449
Merge "Don't close USB type notification when USB is connected to USB devices." into nyc-dev
2016-03-24 02:46:23 +00:00
Mihai Nita
5a7ce50e19
Fix locale reorder jank
...
Using RecyclerView.ItemAnimator.ItemAnimatorFinishedListener
to only update the locales when all the animations finished.
This also reduces the number of repeated updates if the
locale list did not actually changed.
This was tested by setting the duration of animations to 3 seconds,
which made it possible to "shuffle" the list a lot and see several
items slowly moving around in the same time.
Bug: 26710681
Change-Id: I7d025e60cc252f4b90006b7b18c86d93ab94826f
2016-03-23 12:21:31 -07:00
Yorke Lee
fe803a7be4
Merge "Fix build" into nyc-dev am: d0f8d92
...
am: abe553e
* commit 'abe553ed0d4bd4f268b70b4850525fb9895fb7f3':
Fix build
2016-03-23 18:55:10 +00:00
Yorke Lee
abe553ed0d
Merge "Fix build" into nyc-dev
...
am: d0f8d92
* commit 'd0f8d9257b0b1076bbc5fa567fe98c2ae460a291':
Fix build
2016-03-23 18:47:58 +00:00
Udam Saini
ec0baa9701
Updates spacing on redaction interstitial
...
Cleans up the look and feel on the redaction interstitial page
bug:27534261
Change-Id: I9495cfc9493f0d199b30335985761d069a29d42d
2016-03-23 11:29:15 -07:00
Yorke Lee
d0f8d9257b
Merge "Fix build" into nyc-dev
2016-03-23 18:17:58 +00:00
Yorke Lee
d448522a6f
Fix build
...
Change-Id: I99d94806fabef469f4ad984e65a58e4f69808e68
2016-03-23 11:11:46 -07:00
Sudheer Shanka
62bffde1c6
Merge "Add more policy transparency for disallow_remove_user restriction." into nyc-dev am: 45949f9
...
am: 0f0e2df
* commit '0f0e2df40a2ff4537f430ee78ba08e6467e0fb4e':
Add more policy transparency for disallow_remove_user restriction.
2016-03-23 18:10:59 +00:00
Sudheer Shanka
7d1fe37af9
Merge "Add more policy transparency for wifi settings." into nyc-dev am: ed0d4dd
...
am: add53df
* commit 'add53dfcb1eec18615610a632493fb591f924170':
Add more policy transparency for wifi settings.
2016-03-23 18:10:59 +00:00
Sudheer Shanka
97c891b8ee
Merge "Add disabled by policy empty views to more screens." into nyc-dev am: 561a88c
...
am: 9ddc14e
* commit '9ddc14e7c72f4deb89c904efd2f57608c4da78ab':
Add disabled by policy empty views to more screens.
2016-03-23 18:10:58 +00:00
Sudheer Shanka
0f0e2df40a
Merge "Add more policy transparency for disallow_remove_user restriction." into nyc-dev
...
am: 45949f9
* commit '45949f9138f048a9dbf9789c7bd05b751137a0fb':
Add more policy transparency for disallow_remove_user restriction.
2016-03-23 18:06:22 +00:00
Sudheer Shanka
add53dfcb1
Merge "Add more policy transparency for wifi settings." into nyc-dev
...
am: ed0d4dd
* commit 'ed0d4dd463494c011ffcbd079ec321aa1d95e2b4':
Add more policy transparency for wifi settings.
2016-03-23 18:06:22 +00:00
Sudheer Shanka
9ddc14e7c7
Merge "Add disabled by policy empty views to more screens." into nyc-dev
...
am: 561a88c
* commit '561a88cfcd21bcfd2a02c9fa3f3575566ccf7a72':
Add disabled by policy empty views to more screens.
2016-03-23 18:06:21 +00:00
Sudheer Shanka
45949f9138
Merge "Add more policy transparency for disallow_remove_user restriction." into nyc-dev
2016-03-23 17:53:25 +00:00
Sudheer Shanka
ed0d4dd463
Merge "Add more policy transparency for wifi settings." into nyc-dev
2016-03-23 17:53:19 +00:00
Sudheer Shanka
561a88cfcd
Merge "Add disabled by policy empty views to more screens." into nyc-dev
2016-03-23 17:53:15 +00:00
Abodunrinwa Toki
0a35d8a5af
Merge "InputSettings: Physical keyboard settings activity." into nyc-dev am: 14df560
...
am: 181b63e
* commit '181b63ebe09e2ef24bc1d2ad96d79e383525ed02':
InputSettings: Physical keyboard settings activity.
2016-03-23 16:16:53 +00:00
Abodunrinwa Toki
181b63ebe0
Merge "InputSettings: Physical keyboard settings activity." into nyc-dev
...
am: 14df560
* commit '14df56074435ef5cab4010d5c782fdd682509244':
InputSettings: Physical keyboard settings activity.
2016-03-23 16:12:49 +00:00
qinglian.x.zhang
94451eacb4
Merge "Fix no options menu on location settings screen" am: 5c15ff9
...
am: 178b198
* commit '178b198f7053844576e9079c8036c5bb3d52b900':
Fix no options menu on location settings screen
2016-03-23 16:11:06 +00:00
qinglian.x.zhang
178b198f70
Merge "Fix no options menu on location settings screen"
...
am: 5c15ff9
* commit '5c15ff923d6116e7634e7c51cde76ce33ed77368':
Fix no options menu on location settings screen
2016-03-23 16:07:28 +00:00
Abodunrinwa Toki
14df560744
Merge "InputSettings: Physical keyboard settings activity." into nyc-dev
2016-03-23 16:03:24 +00:00
Geoff Mendal
002cd11e96
Import translations. DO NOT MERGE am: 9203c33
-s ours
...
am: e4991bd
-s ours
* commit 'e4991bd6dd3c5be6b3c1326a46b5c66a33602037':
Import translations. DO NOT MERGE
2016-03-23 14:55:13 +00:00
Geoff Mendal
e4991bd6dd
Import translations. DO NOT MERGE
...
am: 9203c33
-s ours
* commit '9203c33008ba048ee306bf4c3a5548ec46004c86':
Import translations. DO NOT MERGE
2016-03-23 14:51:17 +00:00
Geoff Mendal
9203c33008
Import translations. DO NOT MERGE
...
Change-Id: Ibcc935d8f8e5e2af9746f8ba9032855017110127
Auto-generated-cl: translation import
2016-03-23 07:39:30 -07:00
Geoff Mendal
a5421e8f38
Import translations. DO NOT MERGE
...
Change-Id: I39432205d099c448867c42392f9a6e574105fd43
Auto-generated-cl: translation import
2016-03-23 06:35:05 -07:00
Sudheer Shanka
b5c92147ce
Add more policy transparency for disallow_remove_user restriction.
...
Bug: 27784015
Change-Id: I2386efbf521ee8e73326006e78b0146341745e2b
2016-03-22 17:24:07 -07:00