Amit Mahajan
75bbf7bcaa
Merge "Merge "Fix ApnSettings crash issue." into nyc-dev am: afdcb6a78e am: 33c6972453" into nyc-mr1-dev-plus-aosp
...
am: 80219b3060
2016-04-21 20:25:50 +00:00
yifan.bai
d9dc35c0a1
Merge "Fix ApnSettings crash issue." into nyc-dev am: afdcb6a78e am: c91589bddf
...
am: db6cedcfe7
2016-04-21 20:25:49 +00:00
Robin Lee
0ac236461a
Merge changes Ibac27ee1,I336aeefd into nyc-dev am: e2ae135d3c am: 69f12b6e6f
...
am: eaad6d7fcc
2016-04-21 20:25:48 +00:00
Robin Lee
02ba0a13a3
Merge "resolve merge conflicts of 04c7dc2 to master"
2016-04-21 20:16:06 +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
2016-04-21 19:51:44 +00:00
Amit Mahajan
db6cedcfe7
Merge "Fix ApnSettings crash issue." into nyc-dev am: afdcb6a78e
...
am: c91589bddf
2016-04-21 19:51:42 +00:00
yifan.bai
c91589bddf
Merge "Fix ApnSettings crash issue." into nyc-dev
...
am: afdcb6a78e
2016-04-21 19:49:29 +00:00
yifan.bai
33c6972453
Merge "Fix ApnSettings crash issue." into nyc-dev
...
am: afdcb6a78e
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
eaad6d7fcc
Merge changes Ibac27ee1,I336aeefd into nyc-dev am: e2ae135d3c
...
am: 69f12b6e6f
2016-04-21 19:22:35 +00:00
Robin Lee
04c7dc2424
Merge changes Ibac27ee1,I336aeefd into nyc-dev am: e2ae135d3c
...
am: 4a588faeb8
2016-04-21 19:20:05 +00:00
Robin Lee
4a588faeb8
Merge changes Ibac27ee1,I336aeefd into nyc-dev
...
am: e2ae135d3c
2016-04-21 19:17:51 +00:00
Robin Lee
69f12b6e6f
Merge changes Ibac27ee1,I336aeefd into nyc-dev
...
am: e2ae135d3c
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
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
2016-04-21 18:48:16 +00:00
Jason Monk
9ae9194d28
Merge "Fix summary loader lifecycle" into nyc-dev am: 1624f69ac9 am: 2548717d8b
...
am: c50b9ea495
2016-04-21 18:34:48 +00:00
Jason Monk
fa812a5e48
Merge "Fix summary loader lifecycle" into nyc-dev am: 1624f69ac9 am: 2424d1dc04
...
am: f1a78a1264
2016-04-21 18:34:46 +00:00
Jason Monk
c50b9ea495
Merge "Fix summary loader lifecycle" into nyc-dev am: 1624f69ac9
...
am: 2548717d8b
2016-04-21 18:32:53 +00:00
Jason Monk
f1a78a1264
Merge "Fix summary loader lifecycle" into nyc-dev am: 1624f69ac9
...
am: 2424d1dc04
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
2016-04-21 18:28:21 +00:00
Jason Monk
2424d1dc04
Merge "Fix summary loader lifecycle" into nyc-dev
...
am: 1624f69ac9
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
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
2016-04-21 17:27:16 +00:00
Yohei Yukawa
313673b5b3
Merge "Support IMEs that have no subtype in PhysicalKeyboardFragment." into nyc-dev am: b156761ae8 am: 8535b31025
...
am: 35c344afd9
2016-04-21 17:24:37 +00:00
Yohei Yukawa
3d60b539d3
Merge "Support IMEs that have no subtype in PhysicalKeyboardFragment." into nyc-dev am: b156761ae8 am: c61d822f6e
...
am: 06c7b26951
2016-04-21 17:24:35 +00:00
Yohei Yukawa
35c344afd9
Merge "Support IMEs that have no subtype in PhysicalKeyboardFragment." into nyc-dev am: b156761ae8
...
am: 8535b31025
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
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
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
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
Jason Monk
9940002a9f
Merge "Merge "Screen saver string fixes" into nyc-dev am: 990ef94b64 am: 80f32e1dce" into nyc-mr1-dev-plus-aosp
...
am: 6f05fd0d25
2016-04-21 16:05:09 +00:00
Jason Monk
c558423b20
Merge "Screen saver string fixes" into nyc-dev am: 990ef94b64 am: fcc592c6ac
...
am: 5d8c95d931
2016-04-21 16:05:08 +00: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
2016-04-21 16:00:27 +00:00
Jason Monk
5d8c95d931
Merge "Screen saver string fixes" into nyc-dev am: 990ef94b64
...
am: fcc592c6ac
2016-04-21 16:00:25 +00:00
Jason Monk
fcc592c6ac
Merge "Screen saver string fixes" into nyc-dev
...
am: 990ef94b64
2016-04-21 15:58:01 +00:00
Jason Monk
80f32e1dce
Merge "Screen saver string fixes" into nyc-dev
...
am: 990ef94b64
2016-04-21 15:58:00 +00:00
