Geoff Mendal
3efe25059f
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-03-28 14:46:14 +00:00
Geoff Mendal
ff750b5d82
Import translations. DO NOT MERGE
...
Change-Id: I87b7e8ca95a7c65402a93cf6ad37db5222b3e4ec
Auto-generated-cl: translation import
2016-03-28 07:42:47 -07:00
Jason Monk
9f2ba29151
Merge changes I22d799f8,I1bc14e7a into nyc-dev am: 2de6a28
...
am: 81ab842
2016-03-28 14:27:37 +00:00
Jason Monk
81ab842563
Merge changes I22d799f8,I1bc14e7a into nyc-dev
...
am: 2de6a28
2016-03-28 14:23:50 +00:00
Jason Monk
2de6a287ca
Merge changes I22d799f8,I1bc14e7a into nyc-dev
...
* changes:
Guard against crash in dev options
Switch to whitelist for animations
2016-03-28 14:14:01 +00:00
Geoff Mendal
1a57473dde
Import translations. DO NOT MERGE
...
Change-Id: I8303e337afd764231eb307766b38e08b766d8f7a
Auto-generated-cl: translation import
2016-03-28 06:33:52 -07:00
Bill Yi
c7acdb1d46
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 2d17f93 -s ours
...
am: 937ad3c
2016-03-26 17:42:50 +00:00
Bill Yi
937ad3c1a2
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 2d17f93
2016-03-26 17:39:16 +00:00
Bill Yi
6d7f9f20ca
Merge "Import translations. DO NOT MERGE"
2016-03-26 17:26:30 +00:00
Bill Yi
2d17f93122
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-03-26 17:26:11 +00:00
Bill Yi
2393396422
Import translations. DO NOT MERGE
...
Change-Id: I766afa18abf7a57162fc9bc51ed0c1aa9c97e9a9
Auto-generated-cl: translation import
2016-03-26 00:37:09 -07:00
Bill Yi
d2ec0e5219
Import translations. DO NOT MERGE
...
Change-Id: I7bc995d474f548d4628f0b73991a1c8b181f0d45
Auto-generated-cl: translation import
2016-03-25 23:52:45 -07:00
Christopher Tate
7b55a383aa
Call it "Opening links" now am: 13d79b2
...
am: 8d5561f
2016-03-26 00:19:38 +00:00
Christopher Tate
8d5561fc3e
Call it "Opening links" now
...
am: 13d79b2
2016-03-26 00:16:39 +00:00
Christopher Tate
13d79b2a25
Call it "Opening links" now
...
Better labels are better.
Bug 27834016
Change-Id: I3f5a8088234db7790ac8baded0547f415d7e2c4c
2016-03-25 15:06:25 -07:00
Udam Saini
679f7ad07e
Prevents users from being added if device is not provisioned
...
Also added a utility function for checking provisioning, instead of
repeating code for this check in several places.
bug:26156445
Change-Id: I9f4a280dd0cdf889f892e386dbf6a3fdb2a052ef
2016-03-25 13:33:57 -07:00
Alan Viverette
d29d40e822
Merge "Move DensityUtils into SettingsLib" into nyc-dev am: 30dbd47
...
am: 447bb2f
2016-03-25 20:10:07 +00:00
Alan Viverette
447bb2f7da
Merge "Move DensityUtils into SettingsLib" into nyc-dev
...
am: 30dbd47
2016-03-25 20:06:34 +00:00
Alan Viverette
30dbd47a29
Merge "Move DensityUtils into SettingsLib" into nyc-dev
2016-03-25 19:59:38 +00:00
Alan Viverette
6b0b73fdc4
Move DensityUtils into SettingsLib
...
Bug: 27644685
Change-Id: Ie493bd7b07700c2df1221a4257c0487db2a14ff7
2016-03-25 14:56:25 -04:00
Philip P. Moltmann
c85475c50f
Merge "Use changed getStatus interface" into nyc-dev am: 872f621
...
am: a18db31
2016-03-25 16:58:52 +00:00
Philip P. Moltmann
a18db3133a
Merge "Use changed getStatus interface" into nyc-dev
...
am: 872f621
2016-03-25 16:56:31 +00:00
Philip P. Moltmann
872f621eb3
Merge "Use changed getStatus interface" into nyc-dev
2016-03-25 16:50:35 +00:00
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
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
2016-03-24 22:44:59 +00:00
Udam Saini
f7e45a7f28
Merge "Updates spacing on redaction interstitial" into nyc-dev
...
am: 375b981
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
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
2016-03-24 18:44:46 +00:00
Robin Lee
32c3be8e03
Merge "Implement action "android.settings.VPN_SETTINGS"" into nyc-dev
...
am: 1997f76
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
2016-03-24 17:43:04 +00:00
Hall Liu
736afac6cb
Merge "Add indicator for system dialer in Settings" into nyc-dev
...
am: f3dc18b
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
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
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
2016-03-23 18:55:10 +00:00
