Commit Graph

22244 Commits

Author SHA1 Message Date
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
Sudheer Shanka
c3eb16ed18 Show app installer info even if it doesn't handle ACTION.APP_SHOW_INFO.
- Also fix an issue where we are showing the app name instead of it's
  installer name.

Bug: 28301883
Change-Id: I392f7d01f5ec4d1ba5b5030e33ebe8260ff5aa31
2016-04-21 12:51:43 -07: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
Andrew Sapperstein
18b6b04772 Merge "Delete ToastController." 2016-04-21 19:45:53 +00:00
Amit Mahajan
afdcb6a78e Merge "Fix ApnSettings crash issue." into nyc-dev 2016-04-21 19:41:13 +00:00
Robin Lee
99301e06fa resolve merge conflicts of 04c7dc2 to master
Change-Id: I65d9aa34af7d9138b8b0b5ee76dc0de800d88d26
2016-04-21 20:39:13 +01: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
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
b31f7562ff Merge "Open Help forum in browser when click \'Forum\' button." into nyc-mr1-dev am: dd2797d3ef
am: ac42fbcfec

* commit 'ac42fbcfec708562060fd9befa729825fe400948':
  Open Help forum in browser when click 'Forum' button.

Change-Id: If2efcafb649f105a0ac9f95e7d466c552f3a5149
2016-04-21 18:50:34 +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
fa812a5e48 Merge "Fix summary loader lifecycle" into nyc-dev am: 1624f69ac9 am: 2424d1dc04
am: f1a78a1264

* commit 'f1a78a1264c4cc908f79a2259f57848147d512a5':
  Fix summary loader lifecycle

Change-Id: Iec4a09103f6b07f38c8082ae1dee362dd3c4c9e1
2016-04-21 18:34:46 +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
839b4ce52b Merge "Add a deletion helper view for clearing space." into nyc-mr1-dev am: 179103258e
am: 7000aa91b0

* commit '7000aa91b05a65527c95b1e54cdc1665b8d66c3f':
  Add a deletion helper view for clearing space.

Change-Id: I89b59d3955526ecd40dba8464802088bd1daab3f
2016-04-21 17:29:53 +00: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
3d60b539d3 Merge "Support IMEs that have no subtype in PhysicalKeyboardFragment." into nyc-dev am: b156761ae8 am: c61d822f6e
am: 06c7b26951

* commit '06c7b269517da6ad85d77d3ecfbb62260f06aa0e':
  Support IMEs that have no subtype in PhysicalKeyboardFragment.

Change-Id: I236ece93cfc6a88fb6e7e79a3ea4e2896b82a724
2016-04-21 17:24:35 +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
Andrew Sapperstein
308dda9160 Delete ToastController.
Somehow in cherry-picking and merging back down to master, it got
added back.

Change-Id: I71fbb7f02c258a497119ea16271c26a466d68dea
2016-04-21 10:03:00 -07:00
Daniel Nishi
6bd24811cd Merge "Fix a whitespace issue in ManageApplications." 2016-04-21 16:38:33 +00:00
Keith Cheung
83c4d3f8e6 Merge "Include work app in battery optimization settings" into nyc-dev am: 9b167a6878 am: d932c41831
am: 58d16d50b2

* commit '58d16d50b2b7bef505b32b22d4e22394903d7475':
  Include work app in battery optimization settings

Change-Id: Ia9a5c9a1948f6d489213022644888ec310d17ac9
2016-04-21 15:44:50 +00:00
Keith Cheung
58d16d50b2 Merge "Include work app in battery optimization settings" into nyc-dev am: 9b167a6878
am: d932c41831

* commit 'd932c4183194c1d664a07a440f20c467a8d1189a':
  Include work app in battery optimization settings

Change-Id: I2e8d185c2b650ca8d89d47ae9260aa758ba8c7fd
2016-04-21 15:42:30 +00:00
Keith Cheung
43effe8441 Merge "Include work app in battery optimization settings" into nyc-dev
am: 9b167a6878

* commit '9b167a6878d036ffb253687a4eb94e1e44e5fda4':
  Include work app in battery optimization settings

Change-Id: I61f2d84f5f57234a2dbb7a5ef4059b5e63fdfdda
2016-04-21 15:38:30 +00:00
Keith Cheung
d932c41831 Merge "Include work app in battery optimization settings" into nyc-dev
am: 9b167a6878

* commit '9b167a6878d036ffb253687a4eb94e1e44e5fda4':
  Include work app in battery optimization settings

Change-Id: I9998aecbbd7acea6222aa65c6928864b5ea4cd5f
2016-04-21 15:38:02 +00:00
Fan Zhang
35e21cf630 Open Help forum in browser when click 'Forum' button.
Bug: 28301478
Change-Id: I0dad851089aa3061513b65b79d8b31da9ba8767a
2016-04-21 08:27:37 -07:00
Keith Cheung
9b167a6878 Merge "Include work app in battery optimization settings" into nyc-dev 2016-04-21 15:18:06 +00:00
Victor Chang
f2e02db61e Disable trust button when no screenlock is set
Remove button is still allowed as it has been allowed in MNC
(Trust button is new in NYC)

Bug: 28161447
Change-Id: I8df73e1008c2e805f4d0b2ec68d8a4aa3bf75aba
2016-04-21 16:14:09 +01:00
Jason Monk
e8549595bb Merge "Fix only one battery stat showing sometimes." into nyc-dev am: 7bcc48f77d am: a2f7a5980e
am: 763f5c4411

* commit '763f5c4411223f4a3b544141b2ac7843467d56b7':
  Fix only one battery stat showing sometimes.

Change-Id: I68178af4d72ced2c914378f18b46a6dcdc36624e
2016-04-21 14:30:04 +00:00
Jason Monk
763f5c4411 Merge "Fix only one battery stat showing sometimes." into nyc-dev am: 7bcc48f77d
am: a2f7a5980e

* commit 'a2f7a5980e08c446ddf5748e4074c1c1f4e8252c':
  Fix only one battery stat showing sometimes.

Change-Id: I1613068ba88096d78a3894d19135e591f034a191
2016-04-21 14:27:44 +00:00
Jason Monk
a2f7a5980e Merge "Fix only one battery stat showing sometimes." into nyc-dev
am: 7bcc48f77d

* commit '7bcc48f77d1110a14e0cf984431da435ad1b47a5':
  Fix only one battery stat showing sometimes.

Change-Id: I70aac29590b8b65bd904a07f441f467cb7041930
2016-04-21 14:26:01 +00:00
Jason Monk
ec2516dc0b Merge "Fix only one battery stat showing sometimes." into nyc-dev
am: 7bcc48f77d

* commit '7bcc48f77d1110a14e0cf984431da435ad1b47a5':
  Fix only one battery stat showing sometimes.

Change-Id: Ie7abb1569eee61ce2eb28a73728a60695e481f6e
2016-04-21 14:25:31 +00:00
Jason Monk
7bcc48f77d Merge "Fix only one battery stat showing sometimes." into nyc-dev 2016-04-21 14:21:41 +00:00
Jason Monk
a627844fed Fix only one battery stat showing sometimes.
Take into account the prefs we are currently caching within the
group when counting how many prefs have been added.

Change-Id: I962acd41592c1a9366882711d3f4944bffb54d22
Fixes: 27931457
2016-04-21 10:12:30 -04:00
Keisuke Kuroyanagi
cc041f0427 Merge "Fix: Spell checker cannot be re-enabled." into nyc-dev am: bf0e1338ec am: 172829299a
am: 2aa8800f46

* commit '2aa8800f46920ab531ba87d4873ecd992d0b96e1':
  Fix: Spell checker cannot be re-enabled.

Change-Id: Ie34d510218acd8046414efb37dd747067e4b082f
2016-04-21 14:03:21 +00:00