OSDN Git Service
Victor Chang [Wed, 1 Jun 2016 10:22:44 +0000 (10:22 +0000)]
Merge "Show different strings when PO/DO user approves a cert" into nyc-dev am:
36522e8854 am:
5ab70294ed
am:
24b39dce00
* commit '
24b39dce002479369c782887b036f936cb27c776':
Show different strings when PO/DO user approves a cert
Change-Id: Iced70f167bcf899a4dab8c16e048a90d41b0d310
Victor Chang [Wed, 1 Jun 2016 10:18:07 +0000 (10:18 +0000)]
Merge "Show different strings when PO/DO user approves a cert" into nyc-dev am:
36522e8854
am:
5ab70294ed
* commit '
5ab70294ed03f83fd0789477a005225d8caebd5c':
Show different strings when PO/DO user approves a cert
Change-Id: Ib0e1fc2a8f086e7ebf06b3f745f18c343a9ac682
Victor Chang [Wed, 1 Jun 2016 10:13:52 +0000 (10:13 +0000)]
Merge "Show different strings when PO/DO user approves a cert" into nyc-dev
am:
36522e8854
* commit '
36522e885479b30bc49a8a7333f436d5744431bc':
Show different strings when PO/DO user approves a cert
Change-Id: I1cf166e58afd13c0927eb4460a7d88a22ba9dfe7
Victor Chang [Wed, 1 Jun 2016 10:07:16 +0000 (10:07 +0000)]
Merge "Show different strings when PO/DO user approves a cert" into nyc-dev
Tony Mak [Wed, 1 Jun 2016 09:52:49 +0000 (09:52 +0000)]
Merge "Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev am:
ffb10f8156 am:
0b86c6bcc6" into nyc-mr1-dev-plus-aosp
am:
7d3cd0b1d3
* commit '
7d3cd0b1d363a82c16df8c1e9f9ba9a752d42af4':
Change-Id: I1f4da304802b8a468c96cb1bbc982b06d2c4839d
Tony Mak [Wed, 1 Jun 2016 09:52:48 +0000 (09:52 +0000)]
Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev am:
ffb10f8156 am:
caeb93ceda
am:
2abfd032d5
* commit '
2abfd032d5ed250981d02dfd2746f450c0b65631':
Fix RTL issue in Trusted Credentail page
Change-Id: I5ad04475a651a885ae2228efb6cf10be56133864
Android Build Merger (Role) [Wed, 1 Jun 2016 09:48:40 +0000 (09:48 +0000)]
Merge "Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev am:
ffb10f8156 am:
0b86c6bcc6" into nyc-mr1-dev-plus-aosp
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:
caeb93ceda
* commit '
caeb93ceda8bb07c015025a00714241a78a42976':
Fix RTL issue in Trusted Credentail page
Change-Id: I603af8b3455cba99ee8bde3c9dce805b59c10c51
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: Ib91896687a2c5297ae9f1454b0b7729e2dd670a7
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:57:14 +0000 (00:57 +0000)]
Launch E911 address management activity at turning on Wifi Calling am:
90e8e4713c
am:
0500f2bede
* commit '
0500f2bedefe3ecf61e395d5a2285c6972024b3d':
Launch E911 address management activity at turning on Wifi Calling
Change-Id: Ibcc27498999a5f2f62589bab349318cbdb6f2a50
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
Victor Chang [Tue, 31 May 2016 21:07:20 +0000 (22:07 +0100)]
Show different strings when PO/DO user approves a cert
1. This is confusing for restricted users who don't have any options other
than 'Trust'.
2. show dialog title of "Check certificate" instead of "Trust or remove certificate"
The change only applies to ProfileOwner and DeviceOwner case
Fix:
28875819
Change-Id: I3f7dc8f3dcac75b4d99814cbc9af67433676a8c7
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:46:26 +0000 (18:46 +0000)]
Merge "Remove the last vestiges of #
ff009587." into nyc-mr1-dev am:
9ca09c020e
am:
59358568d0
* commit '
59358568d0220dc800cca3ff7633331dfe7e224a':
Remove the last vestiges of #
ff009587.
Change-Id: I3cc323f8b6c98c602f5d934a1d5afb50e82f49d3
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:33:56 +0000 (18:33 +0000)]
Merge "Add an automatic storage management job service." into nyc-mr1-dev am:
d7efefa503
am:
f878423e3d
* commit '
f878423e3dd6cebaac5b77a91c95f2e3ae58c125':
Add an automatic storage management job service.
Change-Id: I63cfc0885b1075e73fbeed65eac8c04eef161851
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:16:46 +0000 (17:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
aa56eef3fd -s ours am:
d18592cdbb -s ours
am:
db3b1b5307 -s ours
* commit '
db3b1b530765f42632dab224959791b319b9b7b7':
Change-Id: I078520bb6d8353098f835473f119c7e2ea0eb9a6
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:50:28 +0000 (16:50 +0000)]
Merge "Change Nav bar style to use system nav (new style for Nexus N+) Bug:
27612740" into nyc-mr1-dev am:
bab65d9fc4
am:
92f200b09c
* commit '
92f200b09c76ae364c8e1eb9b09a4a012a56a9d8':
Change Nav bar style to use system nav (new style for Nexus N+) Bug:
27612740
Change-Id: Ied2a365be78f8495aeb293d6c60cfa2da14f2004
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:45:39 +0000 (16:45 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
aa56eef3fd -s ours am:
13e25431cd -s ours
am:
5b21cc1513 -s ours
* commit '
5b21cc1513030e5fcdb84e561d54e53e744bea52':
Import translations. DO NOT MERGE
Change-Id: I44a86e74470c5647fb267e06646cee437f6bcd84
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 05:07:24 +0000 (05:07 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
442628a226 -s ours
am:
54ce05d3e3 -s ours
* commit '
54ce05d3e373e7cc6d5b4b0f6a19de0c9e3c0728':
Import translations. DO NOT MERGE
Change-Id: I3934eede769644d25a8ba3a74b2cf7d778607418
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:28 +0000 (03:54 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 31 May 2016 03:54:15 +0000 (03:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Roozbeh Pournader [Tue, 31 May 2016 02:24:43 +0000 (02:24 +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
am:
e2bc59b045
* commit '
e2bc59b04533f0c04599aecd21fb092141b33cf6':
Change-Id: I271d5a51f9181e37e99b2b4cb8a0289b8793ad39
Roozbeh Pournader [Tue, 31 May 2016 02:24:42 +0000 (02:24 +0000)]
Merge "Show only up to two locales in Settings" into nyc-dev am:
a260cf8931 am:
aacca81c31
am:
3aaa715332
* commit '
3aaa71533267226a4db6594ecc98a7e3c23a7700':
Change-Id: I9aeea74adad98447ef3f2eee2c656eed21ec6ad7
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:31:58 +0000 (01:31 +0000)]
Merge "Show only up to two locales in Settings" into nyc-dev am:
a260cf8931 am:
c34946b8fb
am:
e784c743d9
* commit '
e784c743d9e255a14030bc006c96433acdb9275c':
Show only up to two locales in Settings
Change-Id: I9c7c5eaf55bf68aea8f23e28ccf14b622c049bac
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
Bill Yi [Mon, 30 May 2016 18:19:55 +0000 (11:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: If0994c4614782c53c4b0f002dd12d87758f6a49e
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 20:48:17 +0000 (20:48 +0000)]
Merge "Fix pref availability for search" into nyc-dev am:
8eaa3de931 am:
6ed9be1352
am:
ec57cbf8fc
* commit '
ec57cbf8fcf5869e7de8bbd382bfa5e2215f9567':
Change-Id: Id889bcfcaed296a5fc287a37c2f940bab4cb051a
Jason Monk [Fri, 27 May 2016 20:48:16 +0000 (20:48 +0000)]
Merge "Don\'t allow restricted data usage of system" into nyc-dev am:
da52f08b0a am:
3b8dd1eeae
am:
797e708539
* commit '
797e708539083cc87d04bcd0057dc81da828812b':
Change-Id: Idcda763fda97ed824f3c370976b9b2298e4789a5
Jason Monk [Fri, 27 May 2016 20:48:14 +0000 (20:48 +0000)]
Merge "Fix pref availability for search" into nyc-dev am:
8eaa3de931 am:
83c2670cda
am:
4a47287267
* commit '
4a47287267136866eeecba3d8840454e81028b21':
Fix pref availability for search
Change-Id: I03caca7f39056d028fa60fdf3f6aaec62619f830
Jason Monk [Fri, 27 May 2016 20:48:12 +0000 (20:48 +0000)]
Merge "Don\'t allow restricted data usage of system" into nyc-dev am:
da52f08b0a am:
ef19af788c
am:
54ed02784f
* commit '
54ed02784f15d66f9ad6ea67d27d348a167d83fb':
Don't allow restricted data usage of system
Change-Id: I8b4142f0b395ba3b5bf907ac6181d9135ca3e8cd
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:32:40 +0000 (15:32 +0000)]
Importance slider updates. am:
9782079130
am:
af2e6d69a6
* commit '
af2e6d69a63a3115d9905d3cbb5ad11718afe9b7':
Importance slider updates.
Change-Id: Id02ae7849bb2ed01afd12a6294418a1bd402fee3
Paul Stewart [Fri, 27 May 2016 15:32:37 +0000 (15:32 +0000)]
Merge "Display connect button in the wifi connection menu" am:
9126cfba19 am:
ace9f52725 am:
aa5afb18fe
am:
38e93b85f0
* commit '
38e93b85f0d3d5dff06034d0e3616015b73f50dc':
Display connect button in the wifi connection menu
Change-Id: Id7025428de1e16e481bfbca8fa61004df36f34dc
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 05:06:50 +0000 (05:06 +0000)]
Revert "Importance slider updates." am:
72167fe650
am:
ca4fc0e4a2
* commit '
ca4fc0e4a25b5ad9486d51dd50d9a5ee0bae88c1':
Revert "Importance slider updates."
Change-Id: Ia30b1449fa67d2ea2db5aefb379826af3d9aabdf
Roozbeh Pournader [Fri, 27 May 2016 05:06:49 +0000 (05:06 +0000)]
Merge "Force dashboard summary to single-line and ellipsize it" into nyc-dev am:
24aa3b01af am:
e0adabcd87
am:
53d5f79d33
* commit '
53d5f79d33eaf4f252175837294d33a611e62eca':
Change-Id: I496fcde0fd8e224fac401f36c6d81306031082ba
Maurice Lam [Fri, 27 May 2016 05:06:48 +0000 (05:06 +0000)]
Merge "Add activity label to encryption interstitial" into nyc-dev am:
19c0046422 am:
6b24f367f8
am:
3dd8372542
* commit '
3dd83725429b0b91e47f9a5bce8a8ccfca9c6d3d':
Change-Id: Id7bbc8b30b58b5b0acb1fce739a2de135047d222
Bill Yi [Fri, 27 May 2016 05:06:46 +0000 (05:06 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
d5f7c20a26 -s ours am:
4422014feb -s ours
am:
3bef07780b -s ours
* commit '
3bef07780b92550bc7e5c4975ef4c0bcf91d9a72':
Change-Id: I4ac03c679a57638aacb18a69c82749c7b1ae1ac4
Julia Reynolds [Fri, 27 May 2016 05:06:44 +0000 (05:06 +0000)]
Merge "Importance slider updates." into nyc-dev am:
7c2c025e4f am:
b0f0d299cf
am:
247697277a
* commit '
247697277ab49e9a1eeff48db0f20381fc66d57e':
Change-Id: I4132c9265677d41be98805abf04619c563c57010
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 03:31:36 +0000 (03:31 +0000)]
Revert "Importance slider updates."
am:
690f712595
* commit '
690f71259568dafd4e54367e8d13bfc6157de05a':
Revert "Importance slider updates."
Change-Id: I55aff390f45832066d99beaa1d88089b47e2889d
Bart Sears [Fri, 27 May 2016 01:58:26 +0000 (01:58 +0000)]
Revert "Importance slider updates."
This reverts commit
373a9e2fcfedda0dbf736d2e3f95edaf38833756.
Change-Id: I3279163eb052f93cf6b87710c17cfa0c2eae56ba
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:32:36 +0000 (00:32 +0000)]
Merge "Force dashboard summary to single-line and ellipsize it" into nyc-dev am:
24aa3b01af am:
49d704c228
am:
8208d69e34
* commit '
8208d69e34c1ff186cc65eb89a9b4e3af4f31c2a':
Force dashboard summary to single-line and ellipsize it
Change-Id: I7e96432e943609b3580d4352e09e03ea1f6a0293
Maurice Lam [Fri, 27 May 2016 00:32:35 +0000 (00:32 +0000)]
Merge "Add activity label to encryption interstitial" into nyc-dev am:
19c0046422 am:
2ddf85b94b
am:
934bb00ac3
* commit '
934bb00ac317001db159bc28e12e4c43905a88c9':
Add activity label to encryption interstitial
Change-Id: I7e2eaabb379bf878f88b12cee4c4909b5100499e
Bill Yi [Fri, 27 May 2016 00:32:35 +0000 (00:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
d5f7c20a26 -s ours am:
1c6e3e571f -s ours
am:
202f94bb11 -s ours
* commit '
202f94bb11d646879b5cf630144264d3f7d0aaa3':
Import translations. DO NOT MERGE
Change-Id: I043dd252b76d1e48d248071f9303b27fc882a800
OSDN Git Service
