OSDN Git Service
Tony Mak [Wed, 1 Jun 2016 09:48:27 +0000 (09:48 +0000)]
Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev am:
ffb10f8156
am:
0b86c6bcc6
* commit '
0b86c6bcc65a8df9cb78b2fdc41f4ad0b71550ff':
Fix RTL issue in Trusted Credentail page
Change-Id: I0e3dff9ef8b4019ba5badb6b159268013f92b172
Tony Mak [Wed, 1 Jun 2016 09:44:06 +0000 (09:44 +0000)]
Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev
am:
ffb10f8156
* commit '
ffb10f8156b42261340362ee440002dd7f0a5c5b':
Fix RTL issue in Trusted Credentail page
Change-Id: I0d5504ccca59ee03b7ad8efbd26128f394721b82
Tony Mak [Wed, 1 Jun 2016 09:36:51 +0000 (09:36 +0000)]
Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev
Meng Wang [Wed, 1 Jun 2016 00:46:33 +0000 (00:46 +0000)]
Launch E911 address management activity at turning on Wifi Calling
am:
90e8e4713c
* commit '
90e8e4713c7710f765868ed90f69e2424eb19fe5':
Launch E911 address management activity at turning on Wifi Calling
Change-Id: Ie526f9a5c0d6f66c5e8c79c6ac3299a4aa5a4db6
Meng Wang [Thu, 26 May 2016 00:12:27 +0000 (17:12 -0700)]
Launch E911 address management activity at turning on Wifi Calling
Bug:
28404126
Change-Id: Id551d784d151e5f24cfcec96e6cf4b999f39ce0f
Tony Mak [Tue, 31 May 2016 19:51:01 +0000 (20:51 +0100)]
Fix RTL issue in Trusted Credentail page
Two changes are required to fix the issue.
1. The width of the textview needed to be wrap_content in order
to resolve the random issue. I guess it is a framework bug, but
anyway the UI looks the same after the change
2. textAlignment="viewStart" is needed to make the textview RTL
3. Clean up: Change the RelativeLayout to a vertical LinearLayout
Bug:
28757193
Change-Id: I1142d4dd31eb86b80f5a2316c1c7825df287b609
Andrew Sapperstein [Tue, 31 May 2016 18:43:59 +0000 (18:43 +0000)]
Merge "Remove the last vestiges of #
ff009587." into nyc-mr1-dev
am:
9ca09c020e
* commit '
9ca09c020e561832cd2e4b5abd43c839c461c240':
Remove the last vestiges of #
ff009587.
Change-Id: Iac6ec5047f88b277d313b98c19c4eac4ddce626f
Andrew Sapperstein [Tue, 31 May 2016 18:38:07 +0000 (18:38 +0000)]
Merge "Remove the last vestiges of #
ff009587." into nyc-mr1-dev
Daniel Nishi [Tue, 31 May 2016 18:31:32 +0000 (18:31 +0000)]
Merge "Add an automatic storage management job service." into nyc-mr1-dev
am:
d7efefa503
* commit '
d7efefa503ae408072e45dc6520a4236b8ef40cb':
Add an automatic storage management job service.
Change-Id: Idd479e72efbe2d62225493c0dfdb7d55ee4f8b20
Daniel Nishi [Tue, 31 May 2016 18:25:18 +0000 (18:25 +0000)]
Merge "Add an automatic storage management job service." into nyc-mr1-dev
Bill Yi [Tue, 31 May 2016 17:14:11 +0000 (17:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
aa56eef3fd -s ours
am:
d18592cdbb -s ours
* commit '
d18592cdbbf689ae458128c9217b404d1111a7ed':
Change-Id: I04ea249c5e6b6272bceabb6b85c8b7750e19f8a2
Daniel Nishi [Wed, 4 May 2016 17:08:36 +0000 (10:08 -0700)]
Add an automatic storage management job service.
This service runs once a day when plugged in when the device has
under 15% free space remaining. If the FeatureFactory has a
storage management job, it runs the job to begin to free up space
on the device.
This is a temporary landing place and will be refactored very
quickly out of Settings.
Bug:
28600825
Change-Id: Id2ebb42a333b3b4e3daef4e50cf985fe055b85c7
Anna Galusza [Tue, 31 May 2016 16:45:39 +0000 (16:45 +0000)]
Merge "Change Nav bar style to use system nav (new style for Nexus N+) Bug:
27612740" into nyc-mr1-dev
am:
bab65d9fc4
* commit '
bab65d9fc41836624bf385898ad21ca14d2f72fe':
Change Nav bar style to use system nav (new style for Nexus N+) Bug:
27612740
Change-Id: Icb6c321b7382fe3816cde21e9db72b07f7ba0084
Bill Yi [Tue, 31 May 2016 16:40:18 +0000 (16:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
aa56eef3fd -s ours
am:
13e25431cd -s ours
* commit '
13e25431cdd20e05acfa69f26351d86881598619':
Import translations. DO NOT MERGE
Change-Id: Ibc124314e722d3e5eb327ad65175846ea00220e4
Anna Galusza [Tue, 31 May 2016 16:39:46 +0000 (16:39 +0000)]
Merge "Change Nav bar style to use system nav (new style for Nexus N+) Bug:
27612740" into nyc-mr1-dev
Bill Yi [Tue, 31 May 2016 16:36:46 +0000 (16:36 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
aa56eef3fd -s ours
* commit '
aa56eef3fd67e8eb20df96850e0175fb15b3f415':
Import translations. DO NOT MERGE
Change-Id: I8d141f7bb06750c09b60084105ec51f6aeb244ad
Bill Yi [Tue, 31 May 2016 16:34:43 +0000 (16:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
aa56eef3fd -s ours
* commit '
aa56eef3fd67e8eb20df96850e0175fb15b3f415':
Import translations. DO NOT MERGE
Change-Id: Ib86e499fbcaa25922071cdb5fc08eccdeb5ca5f6
TreeHugger Robot [Tue, 31 May 2016 16:22:39 +0000 (16:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Tue, 31 May 2016 04:52:04 +0000 (04:52 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
442628a226 -s ours
* commit '
442628a22693286cc1f96e1b1fbd8743f9eedea7':
Import translations. DO NOT MERGE
Change-Id: I63a36d6c9a94f27f75adfdc84d2920c55fba2f33
TreeHugger Robot [Tue, 31 May 2016 03:54:15 +0000 (03:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 31 May 2016 02:19:49 +0000 (02:19 +0000)]
Merge "Merge "Merge "Show only up to two locales in Settings" into nyc-dev am:
a260cf8931" into nyc-mr1-dev am:
ed922ce20e" into nyc-mr1-dev-plus-aosp
Roozbeh Pournader [Tue, 31 May 2016 02:19:39 +0000 (02:19 +0000)]
Merge "Merge "Show only up to two locales in Settings" into nyc-dev am:
a260cf8931" into nyc-mr1-dev
am:
ed922ce20e
* commit '
ed922ce20e95ac5d441d0489e4702c9a74652f9b':
Change-Id: I8c3f2d29a706f65d406ff23e01e560ec53512707
Roozbeh Pournader [Tue, 31 May 2016 02:19:37 +0000 (02:19 +0000)]
Merge "Show only up to two locales in Settings" into nyc-dev am:
a260cf8931
am:
aacca81c31
* commit '
aacca81c314d9f5b677427dfc4c2cadfa194f4fb':
Change-Id: Ic00a466681fac4393990d17fc3eefa24486eb26b
Roozbeh Pournader [Tue, 31 May 2016 02:07:35 +0000 (02:07 +0000)]
Merge "Merge "Show only up to two locales in Settings" into nyc-dev am:
a260cf8931" into nyc-mr1-dev
Roozbeh Pournader [Tue, 31 May 2016 01:25:59 +0000 (01:25 +0000)]
Merge "Show only up to two locales in Settings" into nyc-dev am:
a260cf8931
am:
c34946b8fb
* commit '
c34946b8fb2f612b29401b807a8d774fb64a7812':
Show only up to two locales in Settings
Change-Id: I14a74579f9742586c7a3ebec7adc2d1d73da32ab
Roozbeh Pournader [Tue, 31 May 2016 01:20:52 +0000 (01:20 +0000)]
Merge "Show only up to two locales in Settings" into nyc-dev
am:
a260cf8931
* commit '
a260cf8931bb51e2a8879deb8461c9444595b786':
Show only up to two locales in Settings
Change-Id: I8da73979371f5342fc1cd636e0483b7507a06697
Roozbeh Pournader [Tue, 31 May 2016 01:14:42 +0000 (01:14 +0000)]
Merge "Show only up to two locales in Settings" into nyc-dev
am:
a260cf8931
* commit '
a260cf8931bb51e2a8879deb8461c9444595b786':
Show only up to two locales in Settings
Change-Id: I34fae4ef523d9719ce09cc62cd556c56b232b003
Roozbeh Pournader [Tue, 31 May 2016 01:14:39 +0000 (01:14 +0000)]
Merge "Show only up to two locales in Settings" into nyc-dev
am:
a260cf8931
* commit '
a260cf8931bb51e2a8879deb8461c9444595b786':
Show only up to two locales in Settings
Change-Id: I4e9d948e1d5d7e0c96116d2d850adf143b300b1c
Roozbeh Pournader [Tue, 31 May 2016 01:02:41 +0000 (01:02 +0000)]
Merge "Show only up to two locales in Settings" into nyc-dev
Bill Yi [Mon, 30 May 2016 19:22:06 +0000 (12:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3605c1798d792b668db15397c857113d8f7f660c
Auto-generated-cl: translation import
Bill Yi [Mon, 30 May 2016 19:06:25 +0000 (12:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: If3ccb0d85f8c6ab4d8c4968445989fd0083fcbe9
Auto-generated-cl: translation import
Anna Galusza [Thu, 31 Mar 2016 00:25:36 +0000 (17:25 -0700)]
Change Nav bar style to use system nav (new style for Nexus N+)
Bug:
27612740
Change-Id: I309cf8252285130a0e1d2c03ca664706e73cce16
Jason Monk [Fri, 27 May 2016 17:16:07 +0000 (17:16 +0000)]
Merge "Fix pref availability for search" into nyc-dev am:
8eaa3de931
am:
6ed9be1352
* commit '
6ed9be13527fde9be3d013dc241e8c407452f62e':
Change-Id: I5b7449b747bc18df83173097ff4d8cf9eaec1984
Jason Monk [Fri, 27 May 2016 17:16:05 +0000 (17:16 +0000)]
Merge "Don\'t allow restricted data usage of system" into nyc-dev am:
da52f08b0a
am:
3b8dd1eeae
* commit '
3b8dd1eeaea4de4b374ae36b2bc1ea469513f567':
Change-Id: I867a11f05a7d57b553c841d21d2beb0997188996
Jason Monk [Fri, 27 May 2016 17:12:58 +0000 (17:12 +0000)]
Merge "Fix pref availability for search" into nyc-dev am:
8eaa3de931
am:
83c2670cda
* commit '
83c2670cda20810fc1f338456f36ec0df92b8cf4':
Fix pref availability for search
Change-Id: If335b521b4064b4f378c8e4aa24a34cb5daa2eba
Jason Monk [Fri, 27 May 2016 17:12:57 +0000 (17:12 +0000)]
Merge "Don\'t allow restricted data usage of system" into nyc-dev am:
da52f08b0a
am:
ef19af788c
* commit '
ef19af788c6698070dcb8017d084b746bde73abd':
Don't allow restricted data usage of system
Change-Id: Id7dfcfab1f700b861616dfc9e43a348343f5c64b
Jason Monk [Fri, 27 May 2016 17:09:56 +0000 (17:09 +0000)]
Merge "Fix pref availability for search" into nyc-dev
am:
8eaa3de931
* commit '
8eaa3de9317eb21855db43ed276b90ca48ad1d28':
Fix pref availability for search
Change-Id: I777450a2531d9c817d6ff76068b6ac7c02fcb782
Jason Monk [Fri, 27 May 2016 17:09:55 +0000 (17:09 +0000)]
Merge "Don\'t allow restricted data usage of system" into nyc-dev
am:
da52f08b0a
* commit '
da52f08b0a86182cef1f0949f0ef45d5efa092cc':
Don't allow restricted data usage of system
Change-Id: Ic6bba24f75979f9c9ac1fdcf8127f89770bf1f57
Jason Monk [Fri, 27 May 2016 17:08:54 +0000 (17:08 +0000)]
Merge "Fix pref availability for search" into nyc-dev
am:
8eaa3de931
* commit '
8eaa3de9317eb21855db43ed276b90ca48ad1d28':
Fix pref availability for search
Change-Id: If1baba85d5d2897f5a360a75aad96ac72bfe1bd7
Jason Monk [Fri, 27 May 2016 17:08:54 +0000 (17:08 +0000)]
Merge "Don\'t allow restricted data usage of system" into nyc-dev
am:
da52f08b0a
* commit '
da52f08b0a86182cef1f0949f0ef45d5efa092cc':
Don't allow restricted data usage of system
Change-Id: Id5ad8e2b5ab03f397e0340f83b97e3598a308403
Jason Monk [Fri, 27 May 2016 17:07:23 +0000 (17:07 +0000)]
Merge "Fix pref availability for search" into nyc-dev
Jason Monk [Fri, 27 May 2016 16:58:53 +0000 (12:58 -0400)]
Fix pref availability for search
Change-Id: Ic080e131c6c751456b22d370aade77748d912b6b
Fixes:
28987828
Jason Monk [Fri, 27 May 2016 16:51:59 +0000 (16:51 +0000)]
Merge "Don't allow restricted data usage of system" into nyc-dev
Julia Reynolds [Fri, 27 May 2016 15:18:08 +0000 (15:18 +0000)]
Importance slider updates.
am:
9782079130
* commit '
9782079130fb6dd3a83bedde31afa4df6a03b63c':
Importance slider updates.
Change-Id: I267f2237a759b9f86a1b507b1d627ce5367c6cfe
Damien Vagner [Fri, 27 May 2016 15:10:43 +0000 (15:10 +0000)]
Merge "Display connect button in the wifi connection menu" am:
9126cfba19 am:
ace9f52725
am:
aa5afb18fe
* commit '
aa5afb18fe24317584549460f6093826d59d414f':
Display connect button in the wifi connection menu
Change-Id: If596c032697643ddc1b530dca3827added381ea0
Paul Stewart [Fri, 27 May 2016 15:06:06 +0000 (15:06 +0000)]
Merge "Display connect button in the wifi connection menu" am:
9126cfba19
am:
ace9f52725
* commit '
ace9f527253a5464308f8dd3aa97f841d5d2d996':
Display connect button in the wifi connection menu
Change-Id: Ia72d92c7e50cfb316772609e561b34d0b8c62333
Damien Vagner [Fri, 27 May 2016 14:59:10 +0000 (14:59 +0000)]
Merge "Display connect button in the wifi connection menu"
am:
9126cfba19
* commit '
9126cfba19c92d9fbce928ddd0caf7b098b94d3b':
Display connect button in the wifi connection menu
Change-Id: I92ec007a194f6717ec3bea22107c97c555bca09c
Jason Monk [Fri, 27 May 2016 14:57:10 +0000 (10:57 -0400)]
Don't allow restricted data usage of system
Cause it will just crash
Change-Id: I4ee43633eb3fa488816b1d2767073cbe404c2c33
Fixes:
28979013
Paul Stewart [Fri, 27 May 2016 14:50:10 +0000 (14:50 +0000)]
Merge "Display connect button in the wifi connection menu"
Julia Reynolds [Thu, 26 May 2016 15:08:16 +0000 (11:08 -0400)]
Importance slider updates.
Icon & tint.
Bug:
28911161
Change-Id: Ic56270c8803557863f914ee0eaf6801f1341387d
Bart Sears [Fri, 27 May 2016 04:54:37 +0000 (04:54 +0000)]
Revert "Importance slider updates."
am:
72167fe650
* commit '
72167fe65030fffedf728bdd700b8207518c19f3':
Revert "Importance slider updates."
Change-Id: I49edab23842d354bcf321423f46a6a328e2db9c4
Bart Sears [Fri, 27 May 2016 01:58:26 +0000 (01:58 +0000)]
Revert "Importance slider updates."
This reverts commit
373a9e2fcfedda0dbf736d2e3f95edaf38833756.
Change-Id: I3279163eb052f93cf6b87710c17cfa0c2eae56ba
Roozbeh Pournader [Fri, 27 May 2016 04:19:43 +0000 (04:19 +0000)]
Merge "Force dashboard summary to single-line and ellipsize it" into nyc-dev am:
24aa3b01af
am:
e0adabcd87
* commit '
e0adabcd87e0b3a2a1e6918e87c1b917043ded85':
Change-Id: Ib1f946d7515ade63d9ded354615e8d51e4cbad4f
Maurice Lam [Fri, 27 May 2016 04:19:41 +0000 (04:19 +0000)]
Merge "Add activity label to encryption interstitial" into nyc-dev am:
19c0046422
am:
6b24f367f8
* commit '
6b24f367f8ed4ba9dcd406094478f79ea8e7f68a':
Change-Id: Ibce1b4eeda65187e994ebdfb63bbff0ec82bf813
Bill Yi [Fri, 27 May 2016 04:19:37 +0000 (04:19 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
d5f7c20a26 -s ours
am:
4422014feb -s ours
* commit '
4422014febeaa68768e8256cfa6e3560e4a166da':
Change-Id: Ic55f28a5fac46ae170113ff127e22031ad32dfd4
Julia Reynolds [Fri, 27 May 2016 04:19:33 +0000 (04:19 +0000)]
Merge "Importance slider updates." into nyc-dev am:
7c2c025e4f
am:
b0f0d299cf
* commit '
b0f0d299cf034bebc32336b9af8286b7951f6bc8':
Change-Id: Icc3ace9876d1407112c357c0d18be4aef8974377
Roozbeh Pournader [Fri, 27 May 2016 04:05:46 +0000 (04:05 +0000)]
Merge "Force dashboard summary to single-line and ellipsize it" into nyc-dev
am:
24aa3b01af
* commit '
24aa3b01af017c0d020a4e31ff88203f20140ce3':
Force dashboard summary to single-line and ellipsize it
Change-Id: I16fb9f03066017c946fa787ca5b0214e1b9f64de
Maurice Lam [Fri, 27 May 2016 04:05:45 +0000 (04:05 +0000)]
Merge "Add activity label to encryption interstitial" into nyc-dev
am:
19c0046422
* commit '
19c0046422e0cf5586e37323157a27331db45572':
Add activity label to encryption interstitial
Change-Id: I9bcda822435a42c9bf7d5486b7497fb6a8f30cf4
Bill Yi [Fri, 27 May 2016 04:05:43 +0000 (04:05 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
d5f7c20a26 -s ours
* commit '
d5f7c20a268b7c0ebe52bc10f6887b8ad91830f5':
Import translations. DO NOT MERGE
Change-Id: I9387ffb81450e3a57e725a9994c915037eabc49c
Julia Reynolds [Fri, 27 May 2016 04:04:31 +0000 (04:04 +0000)]
Merge "Importance slider updates." into nyc-dev
am:
7c2c025e4f
* commit '
7c2c025e4ff6b91ab3ab1e78e278a12a8051c542':
Importance slider updates.
Change-Id: Ieb897d94383c401154fde35dc9bf94ca57ce1ca6
Bart Sears [Fri, 27 May 2016 01:58:26 +0000 (01:58 +0000)]
Revert "Importance slider updates."
This reverts commit
373a9e2fcfedda0dbf736d2e3f95edaf38833756.
Change-Id: I3279163eb052f93cf6b87710c17cfa0c2eae56ba
Roozbeh Pournader [Fri, 27 May 2016 02:01:06 +0000 (19:01 -0700)]
Show only up to two locales in Settings
The list could otherwise grow very long, spamming the screen.
Bug:
28872122
Change-Id: I8c4dbe659e1c088eba8b5ba1b2905b5eb8bc0229
Roozbeh Pournader [Fri, 27 May 2016 00:30:00 +0000 (00:30 +0000)]
Merge "Force dashboard summary to single-line and ellipsize it" into nyc-dev am:
24aa3b01af
am:
49d704c228
* commit '
49d704c228cfbae65546523db4a6fee3cdbbf5ea':
Force dashboard summary to single-line and ellipsize it
Change-Id: I59c98ac0e5d79f4bfb00d2dbffb1d773a5d5d4f5
Maurice Lam [Fri, 27 May 2016 00:30:00 +0000 (00:30 +0000)]
Merge "Add activity label to encryption interstitial" into nyc-dev am:
19c0046422
am:
2ddf85b94b
* commit '
2ddf85b94b696730189dfda4e680d25a47874eb8':
Add activity label to encryption interstitial
Change-Id: I3922ed6182b5b3b34e0a031af872c5e1a7069143
Bill Yi [Fri, 27 May 2016 00:29:59 +0000 (00:29 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
d5f7c20a26 -s ours
am:
1c6e3e571f -s ours
* commit '
1c6e3e571fd133a7a888fa3c4b37c9b8e3232da5':
Import translations. DO NOT MERGE
Change-Id: Ia54f0858fa61d2d2fc6b1c19b13fee6c5053df04
Julia Reynolds [Fri, 27 May 2016 00:27:40 +0000 (00:27 +0000)]
Merge "Importance slider updates." into nyc-dev am:
7c2c025e4f
am:
fe77548afc
* commit '
fe77548afc37b88fbba44febc18d276137b4c762':
Importance slider updates.
Change-Id: I76c14c4dd5c50d790ec56e24932738e8b0601ccf
Jason Monk [Fri, 27 May 2016 00:26:00 +0000 (00:26 +0000)]
Merge "Fix crash from battery saver switch" into nyc-dev am:
371aec1e92
am:
031faa05e0
* commit '
031faa05e0a5b04086db880844460972a9e24c88':
Change-Id: I455b2db4ad4999f626eecf975d12ddb7a9951fe5
Roozbeh Pournader [Fri, 27 May 2016 00:20:42 +0000 (00:20 +0000)]
Merge "Force dashboard summary to single-line and ellipsize it" into nyc-dev
am:
24aa3b01af
* commit '
24aa3b01af017c0d020a4e31ff88203f20140ce3':
Force dashboard summary to single-line and ellipsize it
Change-Id: If6a43255eb932c479031826caef353138bd35525
Andrew Sapperstein [Fri, 27 May 2016 00:18:38 +0000 (17:18 -0700)]
Remove the last vestiges of #
ff009587.
It was very close the proper colorAccent, so just use that everywhere.
This change updates the Memory Settings page and the running processes
page.
BUG:
28987891
Change-Id: I3895ae9b596125d7e4bda0d02f0686c87a75ead6
Roozbeh Pournader [Fri, 27 May 2016 00:11:47 +0000 (00:11 +0000)]
Merge "Force dashboard summary to single-line and ellipsize it" into nyc-dev
Maurice Lam [Thu, 26 May 2016 23:58:26 +0000 (23:58 +0000)]
Merge "Add activity label to encryption interstitial" into nyc-dev
am:
19c0046422
* commit '
19c0046422e0cf5586e37323157a27331db45572':
Add activity label to encryption interstitial
Change-Id: I6aef221cd49b0bab4ae7da332f388865effb4e20
Roozbeh Pournader [Wed, 25 May 2016 21:33:20 +0000 (14:33 -0700)]
Force dashboard summary to single-line and ellipsize it
Previously, the summary could become multiline. In rare combinations
of text and screen width, to indicate to the user that the text is
cut, we now ellipsize it too. Finally, since the ellipsis can get
too close to the end of the line, we add a padding equal to the left
margin of the icon.
Bug:
28872122
Change-Id: I27226e5de7781cf096508ddbef4f9095961ce028
Maurice Lam [Thu, 26 May 2016 23:46:06 +0000 (23:46 +0000)]
Merge "Add activity label to encryption interstitial" into nyc-dev
Daniel Nishi [Thu, 26 May 2016 20:31:53 +0000 (20:31 +0000)]
Merge "Hide the Deletion Helper entry points from Settings." into nyc-mr1-dev
am:
39d2913e1c
* commit '
39d2913e1cfd455b0f8d571e4656ee6288392425':
Hide the Deletion Helper entry points from Settings.
Change-Id: I5f436a6d19e5e31f6fb5dc04e02a0ad63baaca42
Daniel Nishi [Thu, 26 May 2016 20:28:14 +0000 (20:28 +0000)]
Merge "Hide the Deletion Helper entry points from Settings." into nyc-mr1-dev
Maurice Lam [Thu, 26 May 2016 18:57:24 +0000 (18:57 +0000)]
Merge "Make fingerprint inherit from GLIF theme" into nyc-mr1-dev
am:
2016b1acdb
* commit '
2016b1acdb2839b6559a3e20c51f1eef9fc5719c':
Make fingerprint inherit from GLIF theme
Change-Id: Icfe7e27d60137a69c0a2a4fe78964bb5595b3bd7
Maurice Lam [Thu, 26 May 2016 18:54:02 +0000 (18:54 +0000)]
Merge "Make fingerprint inherit from GLIF theme" into nyc-mr1-dev
Daniel Nishi [Thu, 26 May 2016 18:12:56 +0000 (11:12 -0700)]
Hide the Deletion Helper entry points from Settings.
Remove the menu item which enters the Deletion Helper fragment.
The deletion helper can still be accessed if storage management is
enabled in the storage management settings.
Bug:
28967987
Change-Id: Iff4730998edbab5889b2b8e23b6ad260ae0c0359
Jason Monk [Thu, 26 May 2016 17:59:21 +0000 (17:59 +0000)]
Merge "Fix crash from battery saver switch" into nyc-dev am:
371aec1e92
am:
e3b9c3dd63
* commit '
e3b9c3dd6353ce662b80afb431ffa75e4fcd5f37':
Fix crash from battery saver switch
Change-Id: Iebf8ed4ae246986d5c6c97ff423260caa5e29ea4
Bill Yi [Thu, 26 May 2016 17:54:02 +0000 (17:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
d2ecbf5cf6 -s ours
* commit '
d2ecbf5cf6f14434a10eea857b54009e3cb020a2':
Import translations. DO NOT MERGE
Change-Id: I2b200799212b382a4f7fda058cd017afb2fd6408
Jason Monk [Thu, 26 May 2016 17:53:41 +0000 (17:53 +0000)]
Merge "Fix crash from battery saver switch" into nyc-dev
am:
371aec1e92
* commit '
371aec1e92aa4b5cf6e4ed2b5f39faf180c17d1f':
Fix crash from battery saver switch
Change-Id: I0416b92dbc9b18a97c9d6d0617cba636e310690b
Bill Yi [Thu, 26 May 2016 17:42:02 +0000 (17:42 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
d5f7c20a26 -s ours
* commit '
d5f7c20a268b7c0ebe52bc10f6887b8ad91830f5':
Import translations. DO NOT MERGE
Change-Id: Iec4e72b5683fb0cd6292d586e798b16bbe962e5e
Julia Reynolds [Thu, 26 May 2016 17:37:02 +0000 (17:37 +0000)]
Merge "Importance slider updates." into nyc-dev
am:
7c2c025e4f
* commit '
7c2c025e4ff6b91ab3ab1e78e278a12a8051c542':
Importance slider updates.
Change-Id: Ief2d1785b756e6dad315e286a28115b044174daf
Jason Monk [Thu, 26 May 2016 17:37:00 +0000 (17:37 +0000)]
Merge "Fix crash from battery saver switch" into nyc-dev
am:
371aec1e92
* commit '
371aec1e92aa4b5cf6e4ed2b5f39faf180c17d1f':
Fix crash from battery saver switch
Change-Id: If0c08614030b97453fb7bd7fe756738e288864ae
TreeHugger Robot [Thu, 26 May 2016 17:07:20 +0000 (17:07 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Thu, 26 May 2016 17:06:33 +0000 (17:06 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Julia Reynolds [Thu, 26 May 2016 16:50:56 +0000 (16:50 +0000)]
Merge "Importance slider updates." into nyc-dev
Jason Monk [Thu, 26 May 2016 16:46:51 +0000 (16:46 +0000)]
Merge "Fix crash from battery saver switch" into nyc-dev
Julia Reynolds [Thu, 26 May 2016 15:08:16 +0000 (11:08 -0400)]
Importance slider updates.
Icon & tint.
Bug:
28911161
Change-Id: Ic56270c8803557863f914ee0eaf6801f1341387d
Jason Monk [Thu, 26 May 2016 15:07:53 +0000 (11:07 -0400)]
Fix crash from battery saver switch
Turns out most things expect the conditions to be loaded immediately
so if the dashboard hasn't been hit, they crash. Instead load
immediately for everything but the dashboard.
Change-Id: Iaa1114c88b3766e2ac513acb417ef2a55a0f4e7f
Fixes:
28952354
Android Build Merger (Role) [Thu, 26 May 2016 14:37:23 +0000 (14:37 +0000)]
Merge "Merge "Use LockPatternUtils.resetKeyStore() to clear keystore" into nyc-dev am:
fec38d0699 am:
cc4e5c5443" into nyc-mr1-dev-plus-aosp
Ricky Wai [Thu, 26 May 2016 14:35:57 +0000 (14:35 +0000)]
Merge "Use LockPatternUtils.resetKeyStore() to clear keystore" into nyc-dev am:
fec38d0699
am:
cc4e5c5443
* commit '
cc4e5c5443d7984460a358bae5868cb1f2050de6':
Use LockPatternUtils.resetKeyStore() to clear keystore
Change-Id: Ifeef780b1df20e328a4b8cf6b963598f6bb52bf3
Ricky Wai [Thu, 26 May 2016 14:35:50 +0000 (14:35 +0000)]
Merge "Use LockPatternUtils.resetKeyStore() to clear keystore" into nyc-dev am:
fec38d0699
am:
fed850c9b6
* commit '
fed850c9b63d0419bad398681d5aaf414aebd65c':
Use LockPatternUtils.resetKeyStore() to clear keystore
Change-Id: Icf11c905d4f9f846b6906e933dfe2e4fd8ecab52
Ricky Wai [Thu, 26 May 2016 14:04:25 +0000 (14:04 +0000)]
Merge "Use LockPatternUtils.resetKeyStore() to clear keystore" into nyc-dev
am:
fec38d0699
* commit '
fec38d06991b0c49750d02e27e6d8a452a1bca29':
Use LockPatternUtils.resetKeyStore() to clear keystore
Change-Id: I72265dbbcd34c30c7399ab9c7782763459a19a57
Ricky Wai [Thu, 26 May 2016 14:04:21 +0000 (14:04 +0000)]
Merge "Use LockPatternUtils.resetKeyStore() to clear keystore" into nyc-dev
am:
fec38d0699
* commit '
fec38d06991b0c49750d02e27e6d8a452a1bca29':
Use LockPatternUtils.resetKeyStore() to clear keystore
Change-Id: I1231288f2e7c5166885992b103e720f467358858
Ricky Wai [Thu, 26 May 2016 13:46:25 +0000 (13:46 +0000)]
Merge "Use LockPatternUtils.resetKeyStore() to clear keystore" into nyc-dev
Victor Chang [Thu, 26 May 2016 11:36:29 +0000 (11:36 +0000)]
Merge "Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation" into nyc-dev am:
eb02435cbf
am:
ec4ea60b63
* commit '
ec4ea60b63bec3ba80dead1e4fcbdc19ec37d1d1':
Change-Id: Ie64b89b4cbbedea69e39162dbb7fea66bd33ff5a
Victor Chang [Thu, 26 May 2016 11:27:27 +0000 (11:27 +0000)]
Merge "Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation" into nyc-dev am:
eb02435cbf
am:
195330a9c2
* commit '
195330a9c2cea8d367e5c94cc34cf3454ed17110':
Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation
Change-Id: I5b2799dfc2cd7bceeed463bfa90ad64e63f13c4b
Victor Chang [Thu, 26 May 2016 11:13:40 +0000 (11:13 +0000)]
Merge "Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation" into nyc-dev
am:
eb02435cbf
* commit '
eb02435cbf06335dc641a20a9c244323f7567710':
Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation
Change-Id: I179673366395df90dcef132d17599282ee4d191c
Victor Chang [Thu, 26 May 2016 11:13:39 +0000 (11:13 +0000)]
Merge "Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation" into nyc-dev
am:
eb02435cbf
* commit '
eb02435cbf06335dc641a20a9c244323f7567710':
Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation
Change-Id: I37e0fd839f1daaa8c639fdd22f45329dbf91e689
OSDN Git Service
