OSDN Git Service
Jason Monk [Mon, 11 Apr 2016 13:58:55 +0000 (09:58 -0400)]
Fix localization issues with disabled
Change-Id: Iba63b50000f546a1e323c855462841e82fce4df8
Fixes:
27948378
Jason Monk [Mon, 11 Apr 2016 13:24:38 +0000 (13:24 +0000)]
Merge "Settings tweaks"
Jason Monk [Fri, 8 Apr 2016 18:54:17 +0000 (14:54 -0400)]
Settings tweaks
Change-Id: I68829fa8e49534d4635a008c94dced3c7ab6f4b1
Fixes:
27834471
Fixes:
27834626
Fixes:
27567838
Fixes:
27834676
Clara Bayarri [Mon, 11 Apr 2016 10:05:55 +0000 (10:05 +0000)]
Merge "Add Keyboard Shortcuts Helper entry in Settings" into nyc-dev am:
6599660
am:
232302e
* commit '
232302ef30ea47d19b635ea9839ed83eccb864b1':
Add Keyboard Shortcuts Helper entry in Settings
Change-Id: Iff3367c55d8d92b25328224599cad9e445a6ab48
Clara Bayarri [Mon, 11 Apr 2016 09:55:54 +0000 (09:55 +0000)]
Merge "Add Keyboard Shortcuts Helper entry in Settings" into nyc-dev
am:
6599660
* commit '
659966019601b64fecd24a80d549b8d870059435':
Add Keyboard Shortcuts Helper entry in Settings
Change-Id: I99dd51ef8dfdb80a59e003f332988b298e20152c
Clara Bayarri [Mon, 11 Apr 2016 09:44:20 +0000 (09:44 +0000)]
Merge "Add Keyboard Shortcuts Helper entry in Settings" into nyc-dev
Yohei Yukawa [Sun, 10 Apr 2016 06:40:36 +0000 (06:40 +0000)]
Shorten title name so as not to hit char limit. am:
cf87fd5
am:
5eff28a
* commit '
5eff28a5cfce5c7c29a367c4a9885514088d8a41':
Shorten title name so as not to hit char limit.
Change-Id: Id00e95153de7464c8fcbf7adae9dd2009d1b1f98
Yohei Yukawa [Sun, 10 Apr 2016 06:36:54 +0000 (06:36 +0000)]
Shorten title name so as not to hit char limit.
am:
cf87fd5
* commit '
cf87fd5beda44205a0d87565d2672cf038fbe70e':
Shorten title name so as not to hit char limit.
Change-Id: I849aacf5c30610a8396146b86b65c9ff612ac29d
Yohei Yukawa [Sat, 9 Apr 2016 23:57:24 +0000 (16:57 -0700)]
Shorten title name so as not to hit char limit.
This is a follow up CL to my previous CL [1], which tried to rename a
settings item "Add virtual keyboard" but ended up with hitting char
limit in many languages. We decided to use "Manage keyboards" instead
so as not to hit char limit.
[1]: Id2ae61519152bbe622aa5915f728a4cbbc49e078
611410a8c4b55b0fc6fde3e718f028335dea41d8
Bug:
27543291
Bug:
27959401
Change-Id: I6e4795f8c4dbe9857d036ca19689e05658aa0640
Suprabh Shukla [Sun, 10 Apr 2016 02:03:44 +0000 (19:03 -0700)]
Fixed obsolete import
Change-Id: Ibee0284c61f3e559efeb9a28788b55e86a8355c6
Bill Yi [Sat, 9 Apr 2016 22:44:03 +0000 (22:44 +0000)]
Import translations. DO NOT MERGE am:
2f26075 -s ours
am:
050ead0 -s ours
* commit '
050ead07be0f67a49688a07dee5c42302e77e502':
Import translations. DO NOT MERGE
Change-Id: I195bab1a4f01d40fd72b94befa89984550c0b112
Jason Monk [Sat, 9 Apr 2016 22:44:01 +0000 (22:44 +0000)]
Merge "Settings tweaks" into nyc-dev am:
db3fcfb
am:
14b6f12 -s ours
* commit '
14b6f12aeaaa00d35feee4e5b19f9b6792874c5f':
Settings tweaks
Change-Id: I8b1c1cdcc17a6722c9aba2cb55956f0444f8b5fe
Bill Yi [Sat, 9 Apr 2016 14:11:35 +0000 (14:11 +0000)]
Import translations. DO NOT MERGE
am:
2f26075 -s ours
* commit '
2f260757a2cec3f735d7cc175115cc1f6bee8903':
Import translations. DO NOT MERGE
Change-Id: I99a3400ce2b1583832c46b20454fc97ecfb78870
Bill Yi [Sat, 9 Apr 2016 14:01:49 +0000 (14:01 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Sat, 9 Apr 2016 13:46:45 +0000 (06:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I89dec6af8243722e59f53b19ea182dc1357e4f47
Auto-generated-cl: translation import
Bill Yi [Sat, 9 Apr 2016 13:07:07 +0000 (06:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia44b4686526adde07939fb18f43db0f792832a5f
Auto-generated-cl: translation import
Alan Viverette [Fri, 8 Apr 2016 19:23:29 +0000 (15:23 -0400)]
Fix EBT helper initialization in LabeledSeekBar class
Helper should have same lifecycle as the class itself. Also rearranges
class to match up with standard Android class organization.
Bug:
27674946
Change-Id: Ib2ab1e367d4ef1757321375bbb7e4c5f0dc8f46c
Suprabh Shukla [Sat, 9 Apr 2016 01:34:54 +0000 (18:34 -0700)]
resolve merge conflicts of
d83867c to master
Change-Id: I999d87f33ef028055ea42197b518dbe57e8312cf
Jason Monk [Sat, 9 Apr 2016 00:32:15 +0000 (00:32 +0000)]
Merge "Settings tweaks" into nyc-dev
am:
db3fcfb
* commit '
db3fcfb7cb652c0afdd093e2ec9f387dc01b7819':
Settings tweaks
Change-Id: Ibc9882219ad819cd516bf3c1ce7ce556b36ad9e6
Suprabh Shukla [Sat, 9 Apr 2016 00:32:15 +0000 (00:32 +0000)]
Merge "Moving HelpUtils to SettingsLib" into nyc-dev
am:
1d464b9
* commit '
1d464b9677c4f956dab81622b2cb59c53cbf01dd':
Moving HelpUtils to SettingsLib
Change-Id: I2b855b36d0f3af29f5bc35008017aa7539cd0677
Jason Monk [Fri, 8 Apr 2016 20:46:49 +0000 (20:46 +0000)]
Merge "Settings tweaks" into nyc-dev
Jason Monk [Fri, 8 Apr 2016 18:54:17 +0000 (14:54 -0400)]
Settings tweaks
Change-Id: I68829fa8e49534d4635a008c94dced3c7ab6f4b1
Fixes:
27834471
Fixes:
27834626
Fixes:
27567838
Fixes:
27834676
Suprabh Shukla [Fri, 8 Apr 2016 19:31:36 +0000 (19:31 +0000)]
Merge "Moving HelpUtils to SettingsLib" into nyc-dev
Jason Monk [Fri, 8 Apr 2016 17:34:47 +0000 (13:34 -0400)]
resolve merge conflicts of
65b5952 to master
Change-Id: I0adc036416f21dfa7dd671d4920bce5c26fe7cb6
Jason Monk [Fri, 8 Apr 2016 17:11:43 +0000 (17:11 +0000)]
Merge "Restore the premiume SMS Preference." into nyc-dev
am:
b8bce66
* commit '
b8bce66c02bef58d9df3bdfe0fc4a29da9491296':
Restore the premiume SMS Preference.
Change-Id: Id83745add76b1afba24bf487dab12a66ebe4f0c3
Jason Monk [Fri, 8 Apr 2016 17:04:43 +0000 (17:04 +0000)]
Merge "Restore the premiume SMS Preference." into nyc-dev
Jason Monk [Mon, 28 Mar 2016 19:36:03 +0000 (15:36 -0400)]
Restore the premiume SMS Preference.
Fixes:
27657256
Change-Id: I396eb9ba71f51fed517d7f958873369bc0ab011e
Victor Chang [Fri, 8 Apr 2016 16:02:11 +0000 (16:02 +0000)]
TrustedCredentialsSettings should be launched in personal user instead of work user am:
37afa28
am:
0b4846e
* commit '
0b4846e808f736abb5c524cf914e684d5b12627f':
TrustedCredentialsSettings should be launched in personal user instead of work user
Change-Id: I5f06de99e8f70cb3e2cc4d028c0dd00f9f138818
Victor Chang [Fri, 8 Apr 2016 15:57:44 +0000 (15:57 +0000)]
TrustedCredentialsSettings should be launched in personal user instead of work user
am:
37afa28
* commit '
37afa286f926b527c430c312d509eb8ebe7a2593':
TrustedCredentialsSettings should be launched in personal user instead of work user
Change-Id: I85809994177a3c605e3b3ca4e9d57c7996016566
Daniel U [Fri, 8 Apr 2016 15:55:32 +0000 (15:55 +0000)]
Merge "Allow user to hide sensitive notifications with no work challenge" into nyc-dev am:
9f4ad67
am:
957ec6a
* commit '
957ec6aee4ad8dfbde5cedb9791effdce1ca9825':
Allow user to hide sensitive notifications with no work challenge
Change-Id: I999f240c0112abb9b366017e7def431a2c3dae79
Abodunrinwa Toki [Fri, 8 Apr 2016 15:55:32 +0000 (15:55 +0000)]
Merge "Input settings: Show keyboard layout collection." into nyc-dev am:
f103d10
am:
186d97b
* commit '
186d97bbab34d51a88321da2556eda551ea0ddd3':
Input settings: Show keyboard layout collection.
Change-Id: Ia7e6d50590ac19f9f8e9de333bc36c73d6790c09
Daniel U [Fri, 8 Apr 2016 15:51:13 +0000 (15:51 +0000)]
Merge "Allow user to hide sensitive notifications with no work challenge" into nyc-dev
am:
9f4ad67
* commit '
9f4ad67fad34331aecbdabd4a0193038fa0e9f79':
Allow user to hide sensitive notifications with no work challenge
Change-Id: I80943b49439532bdb676825ac9a8ee5bc7088b11
Abodunrinwa Toki [Fri, 8 Apr 2016 15:51:12 +0000 (15:51 +0000)]
Merge "Input settings: Show keyboard layout collection." into nyc-dev
am:
f103d10
* commit '
f103d10861e6a702f8f29d42e48214c94b1ddb91':
Input settings: Show keyboard layout collection.
Change-Id: I813b902c6638befc9dcd7ebd166e8fe9c33731a5
Victor Chang [Thu, 7 Apr 2016 20:20:38 +0000 (21:20 +0100)]
TrustedCredentialsSettings should be launched in personal user instead of work user
Bug:
18224038
Change-Id: I861a0b98b4b7f0792332b980c1c8e080864b4d57
Daniel U [Fri, 8 Apr 2016 15:44:44 +0000 (15:44 +0000)]
Merge "Allow user to hide sensitive notifications with no work challenge" into nyc-dev
Abodunrinwa Toki [Fri, 8 Apr 2016 15:43:13 +0000 (15:43 +0000)]
Merge "Input settings: Show keyboard layout collection." into nyc-dev
Daniel U [Thu, 7 Apr 2016 18:18:26 +0000 (19:18 +0100)]
Hint user that fingerprint cannot unlock FBE keys
Show a hint text to user noting that pattern/PIN/password is
required when decrypting the credential based storage when file
based encryption is turned on.
The hint text is the same as that of the device unlock screen after
device reboot.
Bug:
27964055
Change-Id: I0d5a493bab69eae5ce4742bd07d4851387863cac
Abodunrinwa Toki [Fri, 8 Apr 2016 13:08:56 +0000 (14:08 +0100)]
Input settings: Show keyboard layout collection.
E.g. Android keyboard or Nexus Compat keyboard.
Bug:
27250977
Change-Id: Icd256a760b157418f52046f10ca272561b692838
Robin Lee [Fri, 8 Apr 2016 11:02:40 +0000 (11:02 +0000)]
Merge "Credential storage: check lock quality for right user" into nyc-dev am:
16b4ac8
am:
c6696f1
* commit '
c6696f1c8675692bb0977a35ab65920f9eef67f1':
Credential storage: check lock quality for right user
Change-Id: Iea17251ba3d27f2d4a2978d4466e5f80c0effdbe
Robin Lee [Fri, 8 Apr 2016 10:58:34 +0000 (10:58 +0000)]
Merge "Credential storage: check lock quality for right user" into nyc-dev
am:
16b4ac8
* commit '
16b4ac8a8efb7ea06397ff559984c3c08f275398':
Credential storage: check lock quality for right user
Change-Id: Iea518cce08617d5ccfa6d5e43d5a65e377631528
Oleksandr Peletskyi [Fri, 8 Apr 2016 10:54:27 +0000 (10:54 +0000)]
Merge "Improved UX when DISALLOW_SET_WALLPAPER is set." into nyc-dev am:
76a2981
am:
717ed0e
* commit '
717ed0eed7bf60ed5163b8139bfdf7fc4f8a3072':
Improved UX when DISALLOW_SET_WALLPAPER is set.
Change-Id: I8d712b436c36041f28e3a1d0871b2a3d83a265f3
Robin Lee [Fri, 8 Apr 2016 10:53:23 +0000 (10:53 +0000)]
Merge "Credential storage: check lock quality for right user" into nyc-dev
Oleksandr Peletskyi [Fri, 8 Apr 2016 10:50:23 +0000 (10:50 +0000)]
Merge "Improved UX when DISALLOW_SET_WALLPAPER is set." into nyc-dev
am:
76a2981
* commit '
76a29810c30978b958f953c3248fbd4ef19b5f79':
Improved UX when DISALLOW_SET_WALLPAPER is set.
Change-Id: I354816c172deb4624326128079b50d6de4bf9031
Oleksandr Peletskyi [Fri, 8 Apr 2016 10:44:05 +0000 (10:44 +0000)]
Merge "Improved UX when DISALLOW_SET_WALLPAPER is set." into nyc-dev
Oleksandr Peletskyi [Tue, 5 Apr 2016 13:37:07 +0000 (15:37 +0200)]
Improved UX when DISALLOW_SET_WALLPAPER is set.
Changed type of Settings > Display > Wallpeper menu item
to RestrictedPreference. This allows to show the reason,
why the Wallpaper menu item is blocked.
BUG:
27914814
Change-Id: I6eb23ec9fcaa39bb7e45d020a5aaca0d83cef81f
Ruben Brunk [Fri, 8 Apr 2016 05:22:47 +0000 (05:22 +0000)]
Merge "Fix Settings activity typo." into nyc-dev am:
77359ad
am:
3f32a9f
* commit '
3f32a9ff1011134f7fcfb1da9b108074e3a988bc':
Fix Settings activity typo.
Change-Id: Idef0d055fadbb2f7b1021bdee2b2601f9add66df
Ruben Brunk [Fri, 8 Apr 2016 05:18:52 +0000 (05:18 +0000)]
Merge "Fix Settings activity typo." into nyc-dev
am:
77359ad
* commit '
77359ad76117c3ffc7fe40890f8bbdc8736f143c':
Fix Settings activity typo.
Change-Id: Ie11bb09128fbbedc72252583e0a6a721ef1e17bd
Ruben Brunk [Fri, 8 Apr 2016 05:13:18 +0000 (05:13 +0000)]
Merge "Fix Settings activity typo." into nyc-dev
Ruben Brunk [Fri, 8 Apr 2016 04:45:41 +0000 (21:45 -0700)]
Fix Settings activity typo.
Bug=
28078304
Change-Id: I2744314bbd97b1c330baa53a07534c461dab3c0f
Fyodor Kupolov [Thu, 7 Apr 2016 23:46:18 +0000 (16:46 -0700)]
Added getProfileIds method returning array of userIds
Previously many usages of UserManager.getProfiles and getEnabledProfiles
were only using ids of returned users. Given that the list of users needs
to be parceled and unparceled for Binder calls, returning array of ids
minimizes memory usage and serialization time.
A new method getProfileIds was introduced which returns an array of userIds.
Existing method calls were updated where appropriate.
Bug:
27705805
Change-Id: Ib042f38d53d95d3b07cda7f824e5cb8c06cd10f5
Toni Barzic [Thu, 7 Apr 2016 23:24:56 +0000 (23:24 +0000)]
Teach settings about PASSWORD_QUALITY_MANAGED constant am:
e7d6e4d
am:
513bdfd
* commit '
513bdfd0526579d79336341d3bb7150ac53b5f20':
Teach settings about PASSWORD_QUALITY_MANAGED constant
Change-Id: I2d329042ad356c568907336f82d5043d591f89d6
Toni Barzic [Thu, 7 Apr 2016 23:21:17 +0000 (23:21 +0000)]
Teach settings about PASSWORD_QUALITY_MANAGED constant
am:
e7d6e4d
* commit '
e7d6e4ddb2371dc49015e17e2d6b9dc604fbbf58':
Teach settings about PASSWORD_QUALITY_MANAGED constant
Change-Id: Iae34431928a38b8bf7de0f59fb0b7bfb306760ff
Fan Zhang [Thu, 7 Apr 2016 23:10:07 +0000 (23:10 +0000)]
Merge "Dashboard status cards UI."
Fan Zhang [Thu, 24 Mar 2016 20:01:05 +0000 (13:01 -0700)]
Dashboard status cards UI.
Bug:
27907841
This adds a card view type to display status in Settings dashboard. Also
added necessary pieces to layout status and condition views properly.
The data for status is not wired up yet.
Change-Id: I8ed624177645f389ec0bb71420f073c6dbc03ccb
Toni Barzic [Wed, 30 Mar 2016 18:43:19 +0000 (11:43 -0700)]
Teach settings about PASSWORD_QUALITY_MANAGED constant
Add hooks for adding an option for selecting a managed password as
lock credential. By default this option will not be visible.
BUG=
27923581
Change-Id: Id17bd8074bf23cbcffb96d8576cc760df6f2298a
Sanket Padawe [Thu, 7 Apr 2016 16:43:03 +0000 (09:43 -0700)]
Fix UI issue in Sim Settings screen.
+ Preference screen for Sim card selection should be enabled when 1)sim
count > 1. 2) no default is set for Sms & Data & sim count >= 1
Bug:
27637607
Change-Id: Idb7207316a7bf9aab119ec6568038990623ba514
Ricky Wai [Thu, 7 Apr 2016 16:34:04 +0000 (16:34 +0000)]
Fix work profile screen timeout policy am:
36cce83
am:
0a18f9d
* commit '
0a18f9d94ca64bff7871812c1202fd9d1cdedd8d':
Fix work profile screen timeout policy
Change-Id: Id59e79f852c2d0cd39d948c55e7e1ebd8c90bbef
Ricky Wai [Thu, 7 Apr 2016 16:30:20 +0000 (16:30 +0000)]
Fix work profile screen timeout policy
am:
36cce83
* commit '
36cce830b9319985b138432b89ea1022acf68785':
Fix work profile screen timeout policy
Change-Id: If444464cd47efd2ced9c7b3d4f99465ab48360ea
Ricky Wai [Fri, 18 Mar 2016 16:26:35 +0000 (16:26 +0000)]
Fix work profile screen timeout policy
Settings screen should apply both primary and managed maximum
timeout policy, even separate profile challenge is enabled.
Bug:
27493348
Change-Id: I09e815d6c6ae6ecd554316cfac82daf0ad0b0cdf
Ricky Wai [Thu, 7 Apr 2016 16:02:18 +0000 (16:02 +0000)]
Delete all work fingerprints when unified lock changes to None/Swipe am:
751de37
am:
d82f072
* commit '
d82f072e0c5ac063d094d65733da4a8117a50cf5':
Delete all work fingerprints when unified lock changes to None/Swipe
Change-Id: I205a28dbbf5440d128ba6ee74ce95adad61f1806
Ricky Wai [Thu, 7 Apr 2016 15:53:08 +0000 (15:53 +0000)]
Delete all work fingerprints when unified lock changes to None/Swipe
am:
751de37
* commit '
751de372750336c2dbc6ed656de84b881ede0858':
Delete all work fingerprints when unified lock changes to None/Swipe
Change-Id: I08b79db759838f9e34d5d8072cd035753db87408
Ricky Wai [Thu, 7 Apr 2016 15:42:45 +0000 (15:42 +0000)]
Fingerprint should confirm device lock when unified am:
996d0df
am:
e9da442
* commit '
e9da44277d875ed8c1f5b3b7c411c706c7201c37':
Fingerprint should confirm device lock when unified
Change-Id: I77738befb17c89442c614f5798aff80049e95464
Ricky Wai [Wed, 6 Apr 2016 14:28:28 +0000 (15:28 +0100)]
Delete all work fingerprints when unified lock changes to None/Swipe
Bug:
27551139
Change-Id: I64105621057e04be0e4d8073626ac3ed0f1e72d2
Ricky Wai [Thu, 7 Apr 2016 15:39:00 +0000 (15:39 +0000)]
Fingerprint should confirm device lock when unified
am:
996d0df
* commit '
996d0dfa6e42e6249853397fafe4a93e7ffeb3f3':
Fingerprint should confirm device lock when unified
Change-Id: I9d925666269a01c6b50224a1fe84ed93f632e08e
Ricky Wai [Tue, 5 Apr 2016 15:33:47 +0000 (16:33 +0100)]
Fingerprint should confirm device lock when unified
When unified and adding a fingerprint, the user is prompted to set up
a backup
Bug:
27419438
Change-Id: I6cfa8c276ae69a0af51580be390c3da4e9596874
Ricky Wai [Thu, 7 Apr 2016 14:44:17 +0000 (14:44 +0000)]
Keymaster init for work profile am:
4bbf065
am:
3c6e000
* commit '
3c6e0008d605c16491e75c78951f37b77d0badc9':
Keymaster init for work profile
Change-Id: I8126a98645715199be665aa3e1f6c037d474b694
Ricky Wai [Thu, 7 Apr 2016 14:38:22 +0000 (14:38 +0000)]
Keymaster init for work profile
am:
4bbf065
* commit '
4bbf0653c0197aca3baa587df80e76ba1159a4fb':
Keymaster init for work profile
Change-Id: I4c61e2762128fa11fbe693d3ae40937a3b9fb29d
Ricky Wai [Fri, 1 Apr 2016 15:31:56 +0000 (16:31 +0100)]
Keymaster init for work profile
Changes:
(1) When unified work challenge is enabled and screen lock is secure
- Store work profile secure key in primary profile
- When primary user keystore unlocked, unlock work profile keystore
- When primary user change lock to none, remove work secure key
(2) When unified work challenge is enabled but screen lock is not secure
- When screen lock changes to secure, store work secure key in primary
(3) When user changes work challenge from unified to separated
- Remove work secure key in primary
(4) When user changes work challenge from separate to unified
- Do (1) and (2)
Bug:
27460698
Change-Id: Id7464c178e6ea7b561643477e7cd84f963048c87
Robin Lee [Thu, 7 Apr 2016 13:55:06 +0000 (14:55 +0100)]
Credential storage: check lock quality for right user
Checking the wrong user can lead to an infinite loop when trying to
install credentials from a managed profile.
Bug:
28043334
Change-Id: I3e1044069f0d5139a47de461996a6d98e0fe5e2f
Robin Lee [Thu, 7 Apr 2016 13:43:34 +0000 (13:43 +0000)]
Merge "Guard double-showing of user credentials dialog" into nyc-dev am:
1dea763
am:
73925bf
* commit '
73925bfe5456da274617d8c3fba32d2858ca8959':
Guard double-showing of user credentials dialog
Change-Id: I21964972bd9434ae71491bf637e7b494cc2ddbae
Robin Lee [Thu, 7 Apr 2016 13:40:21 +0000 (13:40 +0000)]
Merge "Guard double-showing of user credentials dialog" into nyc-dev
am:
1dea763
* commit '
1dea763d05aae89ca87ff0e59513f18ed75e6b35':
Guard double-showing of user credentials dialog
Change-Id: If2c7e62a2ca37a773af18c6c8e6a86f8e94be9c9
Robin Lee [Thu, 7 Apr 2016 13:32:52 +0000 (13:32 +0000)]
Merge "Guard double-showing of user credentials dialog" into nyc-dev
Robin Lee [Thu, 7 Apr 2016 12:17:24 +0000 (13:17 +0100)]
Guard double-showing of user credentials dialog
Only create & show the dialogfragment if it does not already exist.
Bug:
28058930
Change-Id: Ia48cc8a5fd60a12c3beb6c9263036a449cf8d67c
Winston Man [Thu, 7 Apr 2016 09:51:20 +0000 (09:51 +0000)]
Amend icon size for delete work profile dialog am:
90aec18
am:
bea2dd7
* commit '
bea2dd773d40b2bcb5c317ae060b7cd5094e48b3':
Amend icon size for delete work profile dialog
Change-Id: I5f17e6cb394039b4b88de3163edd13223809027e
Winston Man [Thu, 7 Apr 2016 09:48:20 +0000 (09:48 +0000)]
Amend icon size for delete work profile dialog
am:
90aec18
* commit '
90aec184b4229afca5cd7ae549b49ae8f93fd1e7':
Amend icon size for delete work profile dialog
Change-Id: I7ee70923ea575aae530304472acdfd34438bd898
Winston Man [Wed, 6 Apr 2016 20:33:47 +0000 (21:33 +0100)]
Amend icon size for delete work profile dialog
Changes are referenced from
https://cs.corp.google.com/android/packages/apps/ManagedProvisioning/res/layout/device_manager_icon_label.xml
Fixed screenshot:
https://screenshot.googleplex.com/01qOjUp0rp8
Bug:
27636781
Change-Id: Ib6cf303caa388a8b0d2b7664fd9828a8d2f67098
Nicolas Prévot [Thu, 7 Apr 2016 09:39:22 +0000 (09:39 +0000)]
Merge "Ask the user to unlock the work profile before adding a work account." into nyc-dev am:
74777cc
am:
195eadc
* commit '
195eadc1b080246e7cf87e9a879024246a61fbbf':
Ask the user to unlock the work profile before adding a work account.
Change-Id: I0c205d6aca59f995bc30eb22464c735890797fdf
Nicolas Prevot [Thu, 7 Apr 2016 09:30:19 +0000 (09:30 +0000)]
Merge "Ask the user to unlock the work profile before adding a work account." into nyc-dev
am:
74777cc
* commit '
74777ccd90e8b94614ae29beb7a7e1dbadae77f0':
Ask the user to unlock the work profile before adding a work account.
Change-Id: I2c2eb6a1117e95079ac3923368d7715e90457880
Nicolas Prévot [Thu, 7 Apr 2016 09:23:18 +0000 (09:23 +0000)]
Merge "Ask the user to unlock the work profile before adding a work account." into nyc-dev
Suprabh Shukla [Thu, 7 Apr 2016 01:05:36 +0000 (01:05 +0000)]
Merge "Fix user photo popup layout for RTL" into nyc-dev am:
90b71c6
am:
0e90766
* commit '
0e90766a5f703ca7f7a9354f4d675cffdeac5238':
Fix user photo popup layout for RTL
Change-Id: Id94327e224cf78eb26af4afc59f68703459e7477
Ryoji Miyazaki [Thu, 7 Apr 2016 01:02:49 +0000 (01:02 +0000)]
Merge "Fix user photo popup layout for RTL" into nyc-dev
am:
90b71c6
* commit '
90b71c644de6b207fdd420893620214664dc4b44':
Fix user photo popup layout for RTL
Change-Id: Iebb04501346887829d608b7ad38e78186d03fd10
Ryoji Miyazaki [Thu, 7 Apr 2016 00:58:00 +0000 (00:58 +0000)]
Merge "Fix user photo popup layout for RTL" am:
6186414 am:
d0d0af8
am:
3c51422
* commit '
3c5142206751fd2a8a8d34f07d555e56dc9e6d71':
Fix user photo popup layout for RTL
Change-Id: Iee89eb2b252c6fdf920fa84eafd538d7178f0a58
Suprabh Shukla [Thu, 7 Apr 2016 00:56:04 +0000 (00:56 +0000)]
Merge "Fix user photo popup layout for RTL" into nyc-dev
Amith Yamasani [Thu, 7 Apr 2016 00:53:05 +0000 (00:53 +0000)]
Merge "Fix user photo popup layout for RTL" am:
6186414
am:
d0d0af8
* commit '
d0d0af817c015f9fee73d445bb7881a9ce9112a2':
Fix user photo popup layout for RTL
Change-Id: Ibe95cb653b9dcce0489abb6187448464083e224d
Ryoji Miyazaki [Thu, 7 Apr 2016 00:50:21 +0000 (00:50 +0000)]
Merge "Fix user photo popup layout for RTL"
am:
6186414
* commit '
6186414be83ac8b0b92ebe566ca3282dfbc4127a':
Fix user photo popup layout for RTL
Change-Id: Iebf266aa4948a2d24a55ba3876f2e15d085b7112
Amith Yamasani [Thu, 7 Apr 2016 00:44:06 +0000 (00:44 +0000)]
Merge "Fix user photo popup layout for RTL"
Ryoji Miyazaki [Tue, 1 Mar 2016 06:13:36 +0000 (15:13 +0900)]
Fix user photo popup layout for RTL
When RTL language is set, the edit-photo popup window
on user profile info is not shown fully.
The popup window should be aligned with the anchor.
Cherrypick of https://android-review.googlesource.com/#/c/207762/
Bug:
27955356
Change-Id: Ia928c99fbfff3596b048cc3949aef6d03594fed7
Andres Morales [Thu, 7 Apr 2016 00:14:16 +0000 (00:14 +0000)]
Merge "handle devices that don\'t support FLASH_LOCK_STATE" into nyc-dev am:
2006403
am:
11dcefc
* commit '
11dcefc9a87f349d1554645f23bad6d065e5ce2a':
handle devices that don't support FLASH_LOCK_STATE
Change-Id: Ic3e8ab682e2875bbf79c83878d931e305369606f
Andres Morales [Thu, 7 Apr 2016 00:09:13 +0000 (00:09 +0000)]
Merge "handle devices that don\'t support FLASH_LOCK_STATE" into nyc-dev
am:
2006403
* commit '
20064037a7e52584a69edbaeccd29c23630a4156':
handle devices that don't support FLASH_LOCK_STATE
Change-Id: Ib5857f6a49aa8f2e105900a6ec0bcb2bf4908067
Andres Morales [Thu, 7 Apr 2016 00:00:37 +0000 (00:00 +0000)]
Merge "handle devices that don't support FLASH_LOCK_STATE" into nyc-dev
Andres Morales [Wed, 6 Apr 2016 20:22:08 +0000 (13:22 -0700)]
handle devices that don't support FLASH_LOCK_STATE
only disable OEM unlocking pref for devices that report
FLASH_LOCK_UNLOCKED.
Bug:
27967926
Change-Id: Ia41b0dc9249e11df2fb35263ebde05f3a2e0d29a
Sudheer Shanka [Tue, 5 Apr 2016 18:09:59 +0000 (11:09 -0700)]
Auto-link web urls in support messages.
Fixes:
28019243
Change-Id: Ifc4400cf037286d3cdd6b7ac78cefb58f2af400f
Maurice Lam [Wed, 6 Apr 2016 21:41:44 +0000 (21:41 +0000)]
Merge "Update fingerprint strings during setup" into nyc-dev am:
a01e2b9
am:
f312bd6
* commit '
f312bd68dadd6404c3cd86c614b6e08be7d25797':
Update fingerprint strings during setup
Change-Id: Ieb0f1fd7529754ca0a346cb0cb805fb73d0e2996
Maurice Lam [Wed, 6 Apr 2016 21:39:29 +0000 (21:39 +0000)]
Merge "Update fingerprint strings during setup" into nyc-dev
am:
a01e2b9
* commit '
a01e2b96f6c5741e5304e1ae399bbbff32eeaaa4':
Update fingerprint strings during setup
Change-Id: I1a212f2c1d8e28f6743bfbc38e92f1a9cad723aa
Maurice Lam [Wed, 6 Apr 2016 21:34:34 +0000 (21:34 +0000)]
Merge "Update fingerprint strings during setup" into nyc-dev
Fan Zhang [Wed, 6 Apr 2016 20:40:28 +0000 (20:40 +0000)]
Merge "Add a RecyclerView adapter for first tab in settings."
Fan Zhang [Wed, 6 Apr 2016 19:31:51 +0000 (19:31 +0000)]
Merge "Fix animation when expand conditional notices in Settings." into nyc-dev am:
df634d0
am:
4b2519d
* commit '
4b2519d3c1d1030cae6212e37565ecf42bbef5b2':
Fix animation when expand conditional notices in Settings.
Change-Id: I8109c31e037d2bedba15965210b74fef41077ac1
Fan Zhang [Wed, 6 Apr 2016 19:26:11 +0000 (19:26 +0000)]
Merge "Fix animation when expand conditional notices in Settings." into nyc-dev
am:
df634d0
* commit '
df634d03c52ea88f64855935810ee45250fa8528':
Fix animation when expand conditional notices in Settings.
Change-Id: I40ba59ed57d8bd8c82f400bf4dcba7bc7fa794ab
Maurice Lam [Wed, 6 Apr 2016 19:21:54 +0000 (12:21 -0700)]
Update fingerprint strings during setup
Bug:
28004437
Change-Id: I317437ddaf66158e0d30da6d411d9aa7f498688c
Fan Zhang [Wed, 6 Apr 2016 19:07:10 +0000 (19:07 +0000)]
Merge "Fix animation when expand conditional notices in Settings." into nyc-dev
OSDN Git Service
