Android Build Merger (Role)
0da23fd0cb
Merge "Merge "[Fingerprint] Update strings" into nyc-dev am: 498ec55ba3 am: 2ad9f41310" into nyc-mr1-dev-plus-aosp
2016-04-21 22:26:52 +00:00
Maurice Lam
9e71bea21a
Merge "[Fingerprint] Update strings" into nyc-dev am: 498ec55ba3
...
am: 2ad9f41310
* commit '2ad9f41310754cc61d2c8ab55674ccdaefb904bf':
[Fingerprint] Update strings
Change-Id: I3ac0227fc6cfc061c031fe7cfb11f26d6e025cca
2016-04-21 22:26:45 +00:00
Maurice Lam
a752547483
Merge "[Fingerprint] Update strings" into nyc-dev am: 498ec55ba3
...
am: b5e80b1c56
* commit 'b5e80b1c5609e9b0c27d19504426a4f978f8c4f2':
[Fingerprint] Update strings
Change-Id: I778275d60ea567a899406c9467c7196228388991
2016-04-21 22:26:38 +00:00
Maurice Lam
b5e80b1c56
Merge "[Fingerprint] Update strings" into nyc-dev
...
am: 498ec55ba3
* commit '498ec55ba3cc06515d9f19e4990771ce36734206':
[Fingerprint] Update strings
Change-Id: I99bcc81112e55e8c1d6802ce7537d49c8aa1b081
2016-04-21 22:24:28 +00:00
Maurice Lam
2ad9f41310
Merge "[Fingerprint] Update strings" into nyc-dev
...
am: 498ec55ba3
* commit '498ec55ba3cc06515d9f19e4990771ce36734206':
[Fingerprint] Update strings
Change-Id: I9f57efcaea6d856589f0cb1cce37db34f156a7f6
2016-04-21 22:24:13 +00:00
Maurice Lam
498ec55ba3
Merge "[Fingerprint] Update strings" into nyc-dev
2016-04-21 22:06:04 +00:00
Mihai Niță
d3be403652
Merge "Settings: change the TTS text to use the current locale" into nyc-dev am: b1cdea67a5
...
am: 8225f4eeb1
* commit '8225f4eeb1bd8d5c3102d70a60ec0db9b729068d':
Change-Id: I7631bd9250506f40e292c72d17aa5b05a59885fb
2016-04-21 20:07:33 +00:00
Mihai Niță
59368baca7
Merge "Settings: change the TTS text to use the current locale" into nyc-dev am: b1cdea67a5
...
am: 093817bd23
* commit '093817bd237dd757db150689a8acdc5d75feeecc':
Settings: change the TTS text to use the current locale
Change-Id: I962d11edeb49d1caa814a9f96248d0094a4223be
2016-04-21 20:05:36 +00:00
Mihai Nita
8225f4eeb1
Merge "Settings: change the TTS text to use the current locale" into nyc-dev
...
am: b1cdea67a5
* commit 'b1cdea67a5e2dda1ece17df4b98f20e7eeaa8a46':
Settings: change the TTS text to use the current locale
Change-Id: I3dbff4d2ab2b2cb34ab0adf765a75f0bafd33aa8
2016-04-21 20:03:15 +00:00
Mihai Nita
093817bd23
Merge "Settings: change the TTS text to use the current locale" into nyc-dev
...
am: b1cdea67a5
* commit 'b1cdea67a5e2dda1ece17df4b98f20e7eeaa8a46':
Settings: change the TTS text to use the current locale
Change-Id: I1f7098ef1541f9ce89b2fdf2e701cd87166ba777
2016-04-21 20:03:14 +00:00
Mihai Niță
b1cdea67a5
Merge "Settings: change the TTS text to use the current locale" into nyc-dev
2016-04-21 19:55:42 +00:00
Android Build Merger (Role)
80219b3060
Merge "Merge "Fix ApnSettings crash issue." into nyc-dev am: afdcb6a78e am: 33c6972453" into nyc-mr1-dev-plus-aosp
2016-04-21 19:51:51 +00:00
Amit Mahajan
ce19d8d97f
Merge "Fix ApnSettings crash issue." into nyc-dev am: afdcb6a78e
...
am: 33c6972453
* commit '33c69724536847fbd0272f48e359565a8772a405':
Fix ApnSettings crash issue.
Change-Id: Ic03b9c03495c5c6999b375c8eb4c485ad9ea2cd5
2016-04-21 19:51:44 +00:00
Amit Mahajan
db6cedcfe7
Merge "Fix ApnSettings crash issue." into nyc-dev am: afdcb6a78e
...
am: c91589bddf
* commit 'c91589bddf7b170cca768584c0b607bf9bd3951d':
Fix ApnSettings crash issue.
Change-Id: I0f5aee07478f05b2442d1dd8ab8c478a2da17786
2016-04-21 19:51:42 +00:00
yifan.bai
c91589bddf
Merge "Fix ApnSettings crash issue." into nyc-dev
...
am: afdcb6a78e
* commit 'afdcb6a78ebc1c5c685e0b24fbf6bb5c23434b95':
Fix ApnSettings crash issue.
Change-Id: I00942a1d1cc6d1da14cfe31f32fd813796c20fa2
2016-04-21 19:49:29 +00:00
yifan.bai
33c6972453
Merge "Fix ApnSettings crash issue." into nyc-dev
...
am: afdcb6a78e
* commit 'afdcb6a78ebc1c5c685e0b24fbf6bb5c23434b95':
Fix ApnSettings crash issue.
Change-Id: I01da009772e6689a62fca6686900039ec4201fb5
2016-04-21 19:49:28 +00:00
Amit Mahajan
afdcb6a78e
Merge "Fix ApnSettings crash issue." into nyc-dev
2016-04-21 19:41:13 +00:00
yifan.bai
27b908f6d1
Fix ApnSettings crash issue.
...
Steps:
1. Add a new APN;
2. Click 'Reset to default';
3. During reset, click the new APN;
4. Crash happened.
Solution:
Disable menu items when reseting default APN.
Bug: 28314239
Change-Id: I8df439d066e58039e9f91a9be642127eb7298159
2016-04-21 19:23:25 +00:00
Robin Lee
eaad6d7fcc
Merge changes Ibac27ee1,I336aeefd into nyc-dev am: e2ae135d3c
...
am: 69f12b6e6f
* commit '69f12b6e6f405ea0f8205efe11cddc5bb25c54dc':
Change-Id: Id1f0ba90111b8f233a1444d8b97e1ab7c3f6eb2d
2016-04-21 19:22:35 +00:00
Robin Lee
04c7dc2424
Merge changes Ibac27ee1,I336aeefd into nyc-dev am: e2ae135d3c
...
am: 4a588faeb8
* commit '4a588faeb8597fcfe49e1eac90307fb3fbdab244':
Be more aggressive caching Vpn preference attrs
One updateSummary method called by all VPN prefs
Change-Id: I398e1c8ee75c0cec6a569cc469996a5867d8975c
2016-04-21 19:20:05 +00:00
Robin Lee
4a588faeb8
Merge changes Ibac27ee1,I336aeefd into nyc-dev
...
am: e2ae135d3c
* commit 'e2ae135d3c0612081eb6f23e37011e05136a6693':
Be more aggressive caching Vpn preference attrs
One updateSummary method called by all VPN prefs
Change-Id: I5d447989c9a149314bf0fcde0e4f1f77b868f40e
2016-04-21 19:17:51 +00:00
Robin Lee
69f12b6e6f
Merge changes Ibac27ee1,I336aeefd into nyc-dev
...
am: e2ae135d3c
* commit 'e2ae135d3c0612081eb6f23e37011e05136a6693':
Be more aggressive caching Vpn preference attrs
One updateSummary method called by all VPN prefs
Change-Id: I93ffd1d56ca9ff4d8e9c8e16fc897e2368ae1260
2016-04-21 19:17:50 +00:00
Robin Lee
e2ae135d3c
Merge changes Ibac27ee1,I336aeefd into nyc-dev
...
* changes:
Be more aggressive caching Vpn preference attrs
One updateSummary method called by all VPN prefs
2016-04-21 19:13:49 +00:00
Fan Zhang
ac42fbcfec
Merge "Open Help forum in browser when click \'Forum\' button." into nyc-mr1-dev
...
am: dd2797d3ef
* commit 'dd2797d3eff2ab2bb0b42efba4319c6a1249a4c4':
Open Help forum in browser when click 'Forum' button.
Change-Id: I287fe83878876329eb95a2384c5e47b3f55635bc
2016-04-21 18:48:16 +00:00
Jason Monk
c50b9ea495
Merge "Fix summary loader lifecycle" into nyc-dev am: 1624f69ac9
...
am: 2548717d8b
* commit '2548717d8b7610081950a83d497c0236dcf2f0c8':
Change-Id: I5156a325c12f514bc680e56158d1f12402fa4fd0
2016-04-21 18:32:53 +00:00
Jason Monk
f1a78a1264
Merge "Fix summary loader lifecycle" into nyc-dev am: 1624f69ac9
...
am: 2424d1dc04
* commit '2424d1dc043ce0f7113bd789f2701beb8484c9b5':
Fix summary loader lifecycle
Change-Id: Idb8e0530c02389ca097131ed95467042ebe0135c
2016-04-21 18:30:40 +00:00
Fan Zhang
dd2797d3ef
Merge "Open Help forum in browser when click 'Forum' button." into nyc-mr1-dev
2016-04-21 18:28:46 +00:00
Jason Monk
2548717d8b
Merge "Fix summary loader lifecycle" into nyc-dev
...
am: 1624f69ac9
* commit '1624f69ac92d1358a2401125033be5c83025a140':
Fix summary loader lifecycle
Change-Id: Icb1deb9de59dbb7cc3cf6cea80fb8e11445c20a3
2016-04-21 18:28:21 +00:00
Jason Monk
2424d1dc04
Merge "Fix summary loader lifecycle" into nyc-dev
...
am: 1624f69ac9
* commit '1624f69ac92d1358a2401125033be5c83025a140':
Fix summary loader lifecycle
Change-Id: Ib6e0e9de81d9b57e180825b8992ef08327fec9b1
2016-04-21 18:28:19 +00:00
Jason Monk
1624f69ac9
Merge "Fix summary loader lifecycle" into nyc-dev
2016-04-21 18:20:08 +00:00
Jason Monk
0842797a25
Fix summary loader lifecycle
...
Previous CL accidentally cleared the listening bit too early making
it never actually tell the SummaryProviders to stop listening.
Change-Id: I6af1acc861f6987b33641c40637354c75cf4d708
Fixes: 28306872
2016-04-21 14:15:13 -04:00
Daniel Nishi
7000aa91b0
Merge "Add a deletion helper view for clearing space." into nyc-mr1-dev
...
am: 179103258e
* commit '179103258e4e664fbdd76b8440aff3edae86b093':
Add a deletion helper view for clearing space.
Change-Id: If02b00b3e35e717508ae69894a36ac71a1c3c30f
2016-04-21 17:27:16 +00:00
Yohei Yukawa
35c344afd9
Merge "Support IMEs that have no subtype in PhysicalKeyboardFragment." into nyc-dev am: b156761ae8
...
am: 8535b31025
* commit '8535b31025acb952fefabb26812d9e0cc82267b5':
Change-Id: Ifc5c46addbe058845b0e717f45fe4c91cc443783
2016-04-21 17:22:16 +00:00
Daniel Nishi
179103258e
Merge "Add a deletion helper view for clearing space." into nyc-mr1-dev
2016-04-21 17:22:11 +00:00
Daniel Nishi
b84304d4e6
Add a deletion helper view for clearing space.
...
This view provides an interface which allows users to clear out
apps and other data which they may no longer need to alleviate
storage pressure. This implementation gives the bits to uninstall
apps which have not been used within the last 60 days from the
system.
A future patch will add in the ability to extend the deletion helper
view to have additional clearing types.
Change-Id: I65cba54ca247d52227e67e2fa9b84fe63fb8ab34
(cherry picked from commit a671272bf6 )
2016-04-21 10:20:58 -07:00
Yohei Yukawa
06c7b26951
Merge "Support IMEs that have no subtype in PhysicalKeyboardFragment." into nyc-dev am: b156761ae8
...
am: c61d822f6e
* commit 'c61d822f6e781255ad850a0d2eaedfdef6335346':
Support IMEs that have no subtype in PhysicalKeyboardFragment.
Change-Id: I31da307279147ae6c48cbe8bae97b71ad9774ea0
2016-04-21 17:20:33 +00:00
Yohei Yukawa
c61d822f6e
Merge "Support IMEs that have no subtype in PhysicalKeyboardFragment." into nyc-dev
...
am: b156761ae8
* commit 'b156761ae88d63e982bdaae413fe102fc4042c3a':
Support IMEs that have no subtype in PhysicalKeyboardFragment.
Change-Id: I99ee1f03a52d650186070c572641fa84091e21b5
2016-04-21 17:18:20 +00:00
Yohei Yukawa
8535b31025
Merge "Support IMEs that have no subtype in PhysicalKeyboardFragment." into nyc-dev
...
am: b156761ae8
* commit 'b156761ae88d63e982bdaae413fe102fc4042c3a':
Support IMEs that have no subtype in PhysicalKeyboardFragment.
Change-Id: If0b8c97e6a0cad08c2a94039d3543be8fef3260a
2016-04-21 17:18:19 +00:00
Yohei Yukawa
b156761ae8
Merge "Support IMEs that have no subtype in PhysicalKeyboardFragment." into nyc-dev
2016-04-21 17:11:53 +00:00
Robin Lee
b166ea2668
Be more aggressive caching Vpn preference attrs
...
As any change to the preference title will cause it to lose focus,
best not to do this too often.
Change-Id: Ibac27ee1de42fd7ca05f3e3685b84f37dac39517
Fix: 28191965
2016-04-21 18:04:42 +01:00
Android Build Merger (Role)
6f05fd0d25
Merge "Merge "Screen saver string fixes" into nyc-dev am: 990ef94b64 am: 80f32e1dce" into nyc-mr1-dev-plus-aosp
2016-04-21 16:00:35 +00:00
Jason Monk
8b20e4d127
Merge "Screen saver string fixes" into nyc-dev am: 990ef94b64
...
am: 80f32e1dce
* commit '80f32e1dce8015d29fe920acb13e40dcf8518693':
Screen saver string fixes
Change-Id: Ia9be0152b34a91c7173db5ff78138278d2085aa7
2016-04-21 16:00:27 +00:00
Jason Monk
5d8c95d931
Merge "Screen saver string fixes" into nyc-dev am: 990ef94b64
...
am: fcc592c6ac
* commit 'fcc592c6ac60402642ebebc7317ecf28293a0f7a':
Screen saver string fixes
Change-Id: I83b1657abcce0ed9cc685f36bbd95eab4bb390ba
2016-04-21 16:00:25 +00:00
Jason Monk
fcc592c6ac
Merge "Screen saver string fixes" into nyc-dev
...
am: 990ef94b64
* commit '990ef94b646f6d38fa8a44ee26f211014969e08e':
Screen saver string fixes
Change-Id: I4286c726e1faa245860cd038ae037c88a5efc72f
2016-04-21 15:58:01 +00:00
Jason Monk
80f32e1dce
Merge "Screen saver string fixes" into nyc-dev
...
am: 990ef94b64
* commit '990ef94b646f6d38fa8a44ee26f211014969e08e':
Screen saver string fixes
Change-Id: Ie86b8e3c7478f8f7013ed3c61eaee5d9d6c500b2
2016-04-21 15:58:00 +00:00
Jason Monk
990ef94b64
Merge "Screen saver string fixes" into nyc-dev
2016-04-21 15:55:27 +00:00
Jason Monk
ac663d2ff5
Screen saver string fixes
...
Change-Id: I609509787e5f7f9f03eb0e478ab358fe930b0678
Fixes: 28268243
2016-04-21 11:50:58 -04:00
Android Build Merger (Role)
96deee3522
Merge "Merge "Include work app in battery optimization settings" into nyc-dev am: 9b167a6878 am: 43effe8441" into nyc-mr1-dev-plus-aosp
2016-04-21 15:43:25 +00:00
Keith Cheung
f808ffa346
Merge "Include work app in battery optimization settings" into nyc-dev am: 9b167a6878
...
am: 43effe8441
* commit '43effe8441027d92f73616aade1926ecc1a50d28':
Change-Id: Iace769b2bcd6611a4293f8afc6f220b98b07eeb8
2016-04-21 15:43:18 +00:00
Android Build Merger (Role)
e3f3aef1e1
Merge "Merge "Include work app in battery optimization settings" into nyc-dev am: 9b167a6878 am: 43effe8441" into nyc-mr1-dev-plus-aosp
2016-04-21 15:42:41 +00:00