Jason Monk
4a0c449ade
Merge "Pull pref summaries from power usage summary" into nyc-dev
...
am: 3cd935c
2016-04-11 14:31:38 +00:00
Jason Monk
ce15b1c7ed
Merge "Remove OpenGL traces from dev settings" into nyc-dev am: eeb2a19
...
am: f5f750d
2016-04-11 14:31:38 +00:00
Jason Monk
3cd935c89c
Merge "Pull pref summaries from power usage summary" into nyc-dev
2016-04-11 14:28:23 +00:00
Jason Monk
4fbb0e35e8
Merge "Guard against crash in SummaryProvider" into nyc-dev
...
am: 3095c77
2016-04-11 14:26:50 +00:00
Jason Monk
f5f750d840
Merge "Remove OpenGL traces from dev settings" into nyc-dev
...
am: eeb2a19
2016-04-11 14:26:50 +00:00
Jason Monk
e04517611f
Pull pref summaries from power usage summary
...
Change-Id: I9bd3d1041576e183e7e5e03aaecc5128ea5227c2
Fixes: 27644604
2016-04-11 10:25:04 -04:00
Jason Monk
3095c77d5b
Merge "Guard against crash in SummaryProvider" into nyc-dev
2016-04-11 14:23:37 +00:00
Jason Monk
0127eb07f4
Guard against crash in SummaryProvider
...
Change-Id: Ieeae65e50211618dbbee3d320cae614ac5926543
Fixes: 26310547
2016-04-11 10:21:28 -04:00
Jason Monk
4b32de0d35
Fix localization issues with disabled am: 9e9ba0d
...
am: 22b5064
2016-04-11 14:20:17 +00:00
Jason Monk
eeb2a19a50
Merge "Remove OpenGL traces from dev settings" into nyc-dev
2016-04-11 14:19:55 +00:00
Jason Monk
4572249f5d
Remove OpenGL traces from dev settings
...
Change-Id: I43a23e5e7bf02b798f3ddffdf4c21077ef3d5e2f
Fixes: 26741446
2016-04-11 10:17:53 -04:00
Jason Monk
22b5064424
Fix localization issues with disabled
...
am: 9e9ba0d
2016-04-11 14:14:53 +00:00
Jason Monk
9e9ba0d751
Fix localization issues with disabled
...
Change-Id: Iba63b50000f546a1e323c855462841e82fce4df8
Fixes: 27948378
2016-04-11 09:58:55 -04:00
Jason Monk
19fad2550e
Merge "Settings tweaks"
2016-04-11 13:24:38 +00:00
Jason Monk
c19eb986f3
Settings tweaks
...
Change-Id: I68829fa8e49534d4635a008c94dced3c7ab6f4b1
Fixes: 27834471
Fixes: 27834626
Fixes: 27567838
Fixes: 27834676
2016-04-11 09:21:24 -04:00
Clara Bayarri
99ea9716d5
Merge "Add Keyboard Shortcuts Helper entry in Settings" into nyc-dev am: 6599660
...
am: 232302e
2016-04-11 10:05:55 +00:00
Clara Bayarri
232302ef30
Merge "Add Keyboard Shortcuts Helper entry in Settings" into nyc-dev
...
am: 6599660
2016-04-11 09:55:54 +00:00
Clara Bayarri
6599660196
Merge "Add Keyboard Shortcuts Helper entry in Settings" into nyc-dev
2016-04-11 09:44:20 +00:00
Yohei Yukawa
efa5468c0e
Shorten title name so as not to hit char limit. am: cf87fd5
...
am: 5eff28a
2016-04-10 06:40:36 +00:00
Yohei Yukawa
5eff28a5cf
Shorten title name so as not to hit char limit.
...
am: cf87fd5
2016-04-10 06:36:54 +00:00
Yohei Yukawa
cf87fd5bed
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
611410a8c4
2016-04-10 06:30:38 +00:00
Suprabh Shukla
2775de111b
Fixed obsolete import
...
Change-Id: Ibee0284c61f3e559efeb9a28788b55e86a8355c6
2016-04-10 02:15:07 +00:00
Bill Yi
81870def82
Import translations. DO NOT MERGE am: 2f26075 -s ours
...
am: 050ead0
2016-04-09 22:44:03 +00:00
Jason Monk
a4be4da636
Merge "Settings tweaks" into nyc-dev am: db3fcfb
...
am: 14b6f12
2016-04-09 22:44:01 +00:00
Bill Yi
050ead07be
Import translations. DO NOT MERGE
...
am: 2f26075
2016-04-09 14:11:35 +00:00
Bill Yi
91e14b92a9
Merge "Import translations. DO NOT MERGE"
2016-04-09 14:01:50 +00:00
Bill Yi
2f260757a2
Import translations. DO NOT MERGE
...
Change-Id: I89dec6af8243722e59f53b19ea182dc1357e4f47
Auto-generated-cl: translation import
2016-04-09 06:46:45 -07:00
Bill Yi
e890fab34c
Import translations. DO NOT MERGE
...
Change-Id: Ia44b4686526adde07939fb18f43db0f792832a5f
Auto-generated-cl: translation import
2016-04-09 06:07:07 -07:00
Alan Viverette
3550a32ca9
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
2016-04-08 18:37:21 -07:00
Suprabh Shukla
a6820166fa
resolve merge conflicts of d83867c to master
...
Change-Id: I999d87f33ef028055ea42197b518dbe57e8312cf
2016-04-08 18:34:54 -07:00
Jason Monk
14b6f12aea
Merge "Settings tweaks" into nyc-dev
...
am: db3fcfb
2016-04-09 00:32:15 +00:00
Suprabh Shukla
d83867c551
Merge "Moving HelpUtils to SettingsLib" into nyc-dev
...
am: 1d464b9
2016-04-09 00:32:15 +00:00
Jason Monk
db3fcfb7cb
Merge "Settings tweaks" into nyc-dev
2016-04-08 20:46:49 +00:00
Jason Monk
be8d5aa2b9
Settings tweaks
...
Change-Id: I68829fa8e49534d4635a008c94dced3c7ab6f4b1
Fixes: 27834471
Fixes: 27834626
Fixes: 27567838
Fixes: 27834676
2016-04-08 16:44:31 -04:00
Suprabh Shukla
1d464b9677
Merge "Moving HelpUtils to SettingsLib" into nyc-dev
2016-04-08 19:31:37 +00:00
Jason Monk
e74ae23269
resolve merge conflicts of 65b5952 to master
...
Change-Id: I0adc036416f21dfa7dd671d4920bce5c26fe7cb6
2016-04-08 13:34:47 -04:00
Jason Monk
65b5952e4c
Merge "Restore the premiume SMS Preference." into nyc-dev
...
am: b8bce66
2016-04-08 17:11:43 +00:00
Jason Monk
b8bce66c02
Merge "Restore the premiume SMS Preference." into nyc-dev
2016-04-08 17:04:43 +00:00
Jason Monk
ea35f87377
Restore the premiume SMS Preference.
...
Fixes: 27657256
Change-Id: I396eb9ba71f51fed517d7f958873369bc0ab011e
2016-04-08 13:02:48 -04:00
Victor Chang
27fedfc2fa
TrustedCredentialsSettings should be launched in personal user instead of work user am: 37afa28
...
am: 0b4846e
2016-04-08 16:02:11 +00:00
Victor Chang
0b4846e808
TrustedCredentialsSettings should be launched in personal user instead of work user
...
am: 37afa28
2016-04-08 15:57:44 +00:00
Daniel U
1933b8eef8
Merge "Allow user to hide sensitive notifications with no work challenge" into nyc-dev am: 9f4ad67
...
am: 957ec6a
2016-04-08 15:55:32 +00:00
Abodunrinwa Toki
ada3b3a0d4
Merge "Input settings: Show keyboard layout collection." into nyc-dev am: f103d10
...
am: 186d97b
2016-04-08 15:55:32 +00:00
Daniel U
957ec6aee4
Merge "Allow user to hide sensitive notifications with no work challenge" into nyc-dev
...
am: 9f4ad67
2016-04-08 15:51:13 +00:00
Abodunrinwa Toki
186d97bbab
Merge "Input settings: Show keyboard layout collection." into nyc-dev
...
am: f103d10
2016-04-08 15:51:12 +00:00
Victor Chang
37afa286f9
TrustedCredentialsSettings should be launched in personal user instead of work user
...
Bug: 18224038
Change-Id: I861a0b98b4b7f0792332b980c1c8e080864b4d57
2016-04-08 15:48:04 +00:00
Daniel U
9f4ad67fad
Merge "Allow user to hide sensitive notifications with no work challenge" into nyc-dev
2016-04-08 15:44:44 +00:00
Abodunrinwa Toki
f103d10861
Merge "Input settings: Show keyboard layout collection." into nyc-dev
2016-04-08 15:43:13 +00:00
Daniel U
6655e1b6f5
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
2016-04-08 15:23:46 +01:00
Abodunrinwa Toki
f6053d1536
Input settings: Show keyboard layout collection.
...
E.g. Android keyboard or Nexus Compat keyboard.
Bug: 27250977
Change-Id: Icd256a760b157418f52046f10ca272561b692838
2016-04-08 14:08:56 +01:00
