OSDN Git Service
Victor Chang [Thu, 31 Mar 2016 17:46:38 +0000 (17:46 +0000)]
Merge "Show notification when failing to turn on always-on vpn" into nyc-dev am:
b1d7142
am:
5cffb81
* commit '
5cffb81f567009e589e2bbc8ccd3dcae15147f13':
Show notification when failing to turn on always-on vpn
Change-Id: I2446bb50b8981800e400faf4a04f291b416afd58
Victor Chang [Thu, 31 Mar 2016 17:44:34 +0000 (17:44 +0000)]
Merge "Show notification when failing to turn on always-on vpn" into nyc-dev
am:
b1d7142
* commit '
b1d7142cb21de23ec9c1dddb824405bf252bffed':
Show notification when failing to turn on always-on vpn
Change-Id: I76c5ad7c545294edfeb533148ba85cdcdc41dc58
Victor Chang [Thu, 31 Mar 2016 17:04:53 +0000 (17:04 +0000)]
Merge "Show notification when failing to turn on always-on vpn" into nyc-dev
Jason Monk [Thu, 31 Mar 2016 15:50:46 +0000 (15:50 +0000)]
Merge "Fix categeries being read out on settings dashboard" into nyc-dev am:
69446e8
am:
d09508b
* commit '
d09508b8fc2c6fd917ab2f69e1014fa96edf2e1d':
Fix categeries being read out on settings dashboard
Change-Id: I3ffd285de257ed9171a5b0d9f11f61305f22f4bf
Jason Monk [Thu, 31 Mar 2016 15:50:46 +0000 (15:50 +0000)]
Merge "Fix cell data preference in single sim case" into nyc-dev am:
04f10a5
am:
e0ec32c
* commit '
e0ec32c26e580b5dca8c1968f20949021d37211f':
Fix cell data preference in single sim case
Change-Id: I317173dde03aac9d5b5ac0ec9805347a069a6086
Jason Monk [Thu, 31 Mar 2016 15:50:44 +0000 (15:50 +0000)]
Merge changes from topic \'SettingsMetrics\' into nyc-dev am:
50b9592
am:
5c4e4bc
* commit '
5c4e4bcb63bcf01907a0b871b4793a029ddb1968':
Add metrics for suggestions
Add metrics for settings conditionals
Change-Id: Ic33116cf8ef78094a026ef61514019769e44e674
Bill Yi [Thu, 31 Mar 2016 15:50:43 +0000 (15:50 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
645c198 -s ours
am:
987b621 -s ours
* commit '
987b6211574463a3ed139373dd3e1b241dae64d5':
Import translations. DO NOT MERGE
Change-Id: I6353e86f3630d5c063eb02adaf1dde58b744603b
Jason Monk [Thu, 31 Mar 2016 15:43:28 +0000 (15:43 +0000)]
Merge "Fix categeries being read out on settings dashboard" into nyc-dev
am:
69446e8
* commit '
69446e80ab95f7d01b7612a02ae35e75d9b5c609':
Fix categeries being read out on settings dashboard
Change-Id: Ifd3c3ad560969b58557acd86a98eb299d65a4385
Jason Monk [Thu, 31 Mar 2016 15:43:28 +0000 (15:43 +0000)]
Merge "Fix cell data preference in single sim case" into nyc-dev
am:
04f10a5
* commit '
04f10a5eb53bb1ed3d70574102b94b17e075132d':
Fix cell data preference in single sim case
Change-Id: I08d74e06819a2d0487149af5bfa40a6124b3100c
Jason Monk [Thu, 31 Mar 2016 15:43:27 +0000 (15:43 +0000)]
Merge changes from topic \'SettingsMetrics\' into nyc-dev
am:
50b9592
* commit '
50b9592e6116f8a6eca5df2753491a7e26ffde6a':
Add metrics for suggestions
Add metrics for settings conditionals
Change-Id: I40b107005c6a29a010658de643eb94db769ebcb1
Bill Yi [Thu, 31 Mar 2016 15:43:27 +0000 (15:43 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
645c198 -s ours
* commit '
645c198f3e65427017b53957c025b0b3a94ebe52':
Import translations. DO NOT MERGE
Change-Id: I5fd25e9853c625ce669b5ea54e2509351eed24b9
Victor Chang [Mon, 21 Mar 2016 22:57:59 +0000 (22:57 +0000)]
Show notification when failing to turn on always-on vpn
- Notification icon is Settings icon
- VpnName is obtained as the same way as AppPreference
- Post notification as the current user with PendingIntent to VpnSettings to parent user
- Auto-cancel when user taps on the notification
- This implementation posts notification only when the failure happens sychronously
(Assume ConnectivityService only unset always-on package immediately after calling setAlwaysOnVpnPackageForUser)
Bug:
27374485
Change-Id: I0aee38498c8cc300dd8eb9687adcae5f9dc4f8af
Jason Monk [Thu, 31 Mar 2016 14:36:44 +0000 (14:36 +0000)]
Merge "Fix categeries being read out on settings dashboard" into nyc-dev
Jason Monk [Thu, 31 Mar 2016 14:35:03 +0000 (10:35 -0400)]
Fix categeries being read out on settings dashboard
Change-Id: Ica0eec62a532fa40b57553e8e3d9fba1cba3bd4e
Fixes:
26125682
Jason Monk [Thu, 31 Mar 2016 13:56:51 +0000 (13:56 +0000)]
Merge "Fix cell data preference in single sim case" into nyc-dev
Jason Monk [Thu, 31 Mar 2016 13:55:25 +0000 (09:55 -0400)]
Fix cell data preference in single sim case
Change-Id: Ic956d4a7a4935bcdbeaf868f978e23ba11919f9c
Fixes:
27653690
Jason Monk [Thu, 31 Mar 2016 13:47:32 +0000 (13:47 +0000)]
Merge changes from topic 'SettingsMetrics' into nyc-dev
* changes:
Add metrics for suggestions
Add metrics for settings conditionals
Bill Yi [Thu, 31 Mar 2016 13:23:36 +0000 (13:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Thu, 31 Mar 2016 13:22:49 +0000 (13:22 +0000)]
Merge "Import translations. DO NOT MERGE"
Yohei Yukawa [Thu, 31 Mar 2016 06:24:27 +0000 (06:24 +0000)]
Merge changes Ieea9a13a,Id2ae6151 into nyc-dev am:
5ffbf2e
am:
b5164e0
* commit '
b5164e04a3b64af95fa3bbfd17d51e26b0a12247':
Remove gear icon from InputMethodPreference.
Update title to "Add or edit virtual keyboards".
Change-Id: I8bd9ab786944093f6047f38ee4b3611b5c4211b6
Yohei Yukawa [Thu, 31 Mar 2016 06:21:39 +0000 (06:21 +0000)]
Merge changes Ieea9a13a,Id2ae6151 into nyc-dev
am:
5ffbf2e
* commit '
5ffbf2e39d8ce5bb4f1256564fe060534541c710':
Remove gear icon from InputMethodPreference.
Update title to "Add or edit virtual keyboards".
Change-Id: Ideeeb1062a62ed77a7d178c80469effa0c3ade7c
Yohei Yukawa [Thu, 31 Mar 2016 06:13:54 +0000 (06:13 +0000)]
Merge changes Ieea9a13a,Id2ae6151 into nyc-dev
* changes:
Remove gear icon from InputMethodPreference.
Update title to "Add or edit virtual keyboards".
Bill Yi [Thu, 31 Mar 2016 05:29:47 +0000 (22:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I942bbb8156f204723bf2b421702ecf6a1ddbd7cf
Auto-generated-cl: translation import
Bill Yi [Thu, 31 Mar 2016 04:41:30 +0000 (21:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic4e77e1979b46669b31f54f2bf86f31c5f6efb67
Auto-generated-cl: translation import
Noah Wang [Thu, 31 Mar 2016 02:15:34 +0000 (02:15 +0000)]
Merge "Fix crashing of font size settings screen due to the timing of initialization of ExploreByTouchHelper Bug:
27674946" into nyc-dev am:
ca1abaa
am:
52e0b82
* commit '
52e0b820c3e172bdd6128192230aafdad1a8084b':
Fix crashing of font size settings screen due to the timing of initialization of ExploreByTouchHelper Bug:
27674946
Change-Id: Iafb31dcff999d813bd10d9147d242a2fb0d72e0e
Noah Wang [Thu, 31 Mar 2016 02:13:07 +0000 (02:13 +0000)]
Merge "Fix crashing of font size settings screen due to the timing of initialization of ExploreByTouchHelper Bug:
27674946" into nyc-dev
am:
ca1abaa
* commit '
ca1abaa9531523d413830f6763963450ba494f8f':
Fix crashing of font size settings screen due to the timing of initialization of ExploreByTouchHelper Bug:
27674946
Change-Id: I885d01786f73ad794e4e1793390f7dd826b695e9
Daichi Hirono [Thu, 31 Mar 2016 00:40:42 +0000 (00:40 +0000)]
Merge "Change the dialog text in USB device tyep chooser." into nyc-dev am:
9856531
am:
03f89ff
* commit '
03f89ff4fabd7b93d3ad7ed4df04ed88363a12cc':
Change the dialog text in USB device tyep chooser.
Change-Id: I1a84b9946436824abd71519cd192e6262da453da
Noah Wang [Thu, 31 Mar 2016 00:37:02 +0000 (00:37 +0000)]
Merge "Fix crashing of font size settings screen due to the timing of initialization of ExploreByTouchHelper Bug:
27674946" into nyc-dev
Daichi Hirono [Thu, 31 Mar 2016 00:36:16 +0000 (00:36 +0000)]
Merge "Change the dialog text in USB device tyep chooser." into nyc-dev
am:
9856531
* commit '
9856531b450b6bdc73f0d8f4416661c10d4560ec':
Change the dialog text in USB device tyep chooser.
Change-Id: Ided54b1ce7d00dcdf028b1d0724eae117a0f4f64
Daichi Hirono [Wed, 30 Mar 2016 23:59:05 +0000 (23:59 +0000)]
Merge "Change the dialog text in USB device tyep chooser." into nyc-dev
Mihai Nita [Wed, 30 Mar 2016 22:52:42 +0000 (22:52 +0000)]
Merge "Fix missing dot in the remove language confirmation message" into nyc-dev am:
627d0af
am:
7df8853
* commit '
7df885353afd6dbe8133c4f65678301ac705bf56':
Fix missing dot in the remove language confirmation message
Change-Id: Ia729047f2606de48cab8f71696db50867f5d63f5
Mihai Nita [Wed, 30 Mar 2016 22:48:29 +0000 (22:48 +0000)]
Merge "Fix missing dot in the remove language confirmation message" into nyc-dev
am:
627d0af
* commit '
627d0af541b1cc008c69db5f68a402914bd21971':
Fix missing dot in the remove language confirmation message
Change-Id: I2bb5ca2e567adb04bb8f66a067cb71fe33c46b97
Mihai Niță [Wed, 30 Mar 2016 22:37:53 +0000 (22:37 +0000)]
Merge "Fix missing dot in the remove language confirmation message" into nyc-dev
Mihai Nita [Wed, 30 Mar 2016 21:55:30 +0000 (14:55 -0700)]
Fix missing dot in the remove language confirmation message
Bug:
27709559
Change-Id: Ie0f4ecf01578a1f6317b058dfed288dcbfa28d92
Noah Wang [Wed, 30 Mar 2016 21:53:05 +0000 (21:53 +0000)]
Merge "Make preview screens in font/display size settings scrollable Bug:
27274145 Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82" into nyc-dev am:
74df3ec
am:
3859720
* commit '
38597204cb0a77fb05a1b4d51386db10842d8520':
Make preview screens in font/display size settings scrollable Bug:
27274145 Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82
Change-Id: I6d180d1d44799046fadbbde7f2f4a743bf1762cc
Noah Wang [Wed, 30 Mar 2016 21:48:50 +0000 (21:48 +0000)]
Merge "Make preview screens in font/display size settings scrollable Bug:
27274145 Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82" into nyc-dev
am:
74df3ec
* commit '
74df3ec00247ea18ccf43c466e26dfe1a4622162':
Make preview screens in font/display size settings scrollable Bug:
27274145 Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82
Change-Id: Ieb2a3374987ae69f8305aa0b03a94f907d4a4061
Anna Galusza [Wed, 30 Mar 2016 21:48:48 +0000 (21:48 +0000)]
Merge "Fix issues with wrong configuration being used to inflate layouts. Bug:
27700406" into nyc-dev am:
d2a686f
am:
1b48ca5
* commit '
1b48ca589b967725339c16eaeabce33cb8213b99':
Fix issues with wrong configuration being used to inflate layouts. Bug:
27700406
Change-Id: Ib0ebaa392d37cd343ca8bf6338c9abaa467bac51
Anna Galusza [Wed, 30 Mar 2016 21:43:40 +0000 (21:43 +0000)]
Merge "Fix issues with wrong configuration being used to inflate layouts. Bug:
27700406" into nyc-dev
am:
d2a686f
* commit '
d2a686fbc21959d8324e03c87ec106aa0583e912':
Fix issues with wrong configuration being used to inflate layouts. Bug:
27700406
Change-Id: Ia2e96a42b719a4dfe9bff8f59ae0b2a183170a45
Noah Wang [Wed, 30 Mar 2016 21:41:42 +0000 (21:41 +0000)]
Merge "Make preview screens in font/display size settings scrollable Bug:
27274145 Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82" into nyc-dev
Anna Galusza [Wed, 30 Mar 2016 21:39:05 +0000 (21:39 +0000)]
Merge "Fix issues with wrong configuration being used to inflate layouts. Bug:
27700406" into nyc-dev
Noah Wang [Wed, 24 Feb 2016 01:26:13 +0000 (17:26 -0800)]
Make preview screens in font/display size settings scrollable
Bug:
27274145
Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82
Amith Yamasani [Wed, 30 Mar 2016 20:57:19 +0000 (20:57 +0000)]
Merge "Don\'t prompt twice to uninstall updates" into nyc-dev am:
8df0415
am:
251b5a9
* commit '
251b5a9a63f7b8144f9b04dc3bc595a0599c5fc3':
Don't prompt twice to uninstall updates
Change-Id: I869bf5c84fadb15c8365dcc1b3252bebb795adc2
Amith Yamasani [Wed, 30 Mar 2016 20:50:43 +0000 (20:50 +0000)]
Merge "Don\'t prompt twice to uninstall updates" into nyc-dev
am:
8df0415
* commit '
8df04151d0461ce1520043eb74943f67f9a74aa8':
Don't prompt twice to uninstall updates
Change-Id: I35169cfa6a2936638309b23a76c5bcd636df6dc9
Amith Yamasani [Wed, 30 Mar 2016 20:43:03 +0000 (20:43 +0000)]
Merge "Don't prompt twice to uninstall updates" into nyc-dev
Jason Monk [Wed, 30 Mar 2016 20:38:04 +0000 (20:38 +0000)]
Merge "Fix wifi animation issues" into nyc-dev am:
b9b1c08
am:
a3ceb5a
* commit '
a3ceb5ab5665557ce7213c0ab89c7cdb7e49a9d9':
Fix wifi animation issues
Change-Id: I188c7e981bf18f7e7a163e2edfc85b1c50082b74
Jason Monk [Wed, 30 Mar 2016 20:33:39 +0000 (20:33 +0000)]
Merge "Fix wifi animation issues" into nyc-dev
am:
b9b1c08
* commit '
b9b1c083e4bd59e17e29d9b5de4b8fed0a754fb6':
Fix wifi animation issues
Change-Id: I33fda33647e5f9f05af4c57da538836a48bc6e3c
Jason Monk [Wed, 30 Mar 2016 20:24:19 +0000 (20:24 +0000)]
Merge "Fix wifi animation issues" into nyc-dev
Jason Monk [Wed, 30 Mar 2016 20:22:39 +0000 (16:22 -0400)]
Fix wifi animation issues
There are still some remaining animation issues on the wifi screen.
To avoid regressions from M, just disable animations on the entire
wifi screen.
Change-Id: Iabf8ace731638ae7af483c6f3887ca351b17ac60
Fixes:
26271353
Udam Saini [Wed, 30 Mar 2016 20:17:33 +0000 (20:17 +0000)]
Merge "Wait for fingerprints to be removed (Partial fix)." into nyc-dev am:
1f361c2
am:
2a488fc
* commit '
2a488fc54010a827082de2aa3d4308ab9ddbf30f':
Wait for fingerprints to be removed (Partial fix).
Change-Id: I5f08ac6701ec12f4329e1974dd4acc15661f2966
Udam Saini [Wed, 30 Mar 2016 20:13:18 +0000 (20:13 +0000)]
Merge "Wait for fingerprints to be removed (Partial fix)." into nyc-dev
am:
1f361c2
* commit '
1f361c25e09ee07dd0babb4e7b9a8d3720f0ca31':
Wait for fingerprints to be removed (Partial fix).
Change-Id: If4d49cc787554adf56451cff0fb7239e4dda9318
Noah Wang [Wed, 30 Mar 2016 20:10:47 +0000 (20:10 +0000)]
Merge "Adding contentDescription to ViewPager in font/display size settings. Bug:
27326035" into nyc-dev am:
1308bd8
am:
825b050
* commit '
825b0506ff116f850ca81758700281da2b248b8f':
Adding contentDescription to ViewPager in font/display size settings. Bug:
27326035
Change-Id: I4ef8fea79b756cc902415c456b6c850c18f4eb15
Noah Wang [Wed, 30 Mar 2016 20:10:46 +0000 (20:10 +0000)]
Merge "Set minimum height for preview screen of font/display size settings Bug:
27699996" into nyc-dev am:
bcf590c
am:
88bb01d
* commit '
88bb01d96f0a955a8366a7610363f959e2f71d8d':
Set minimum height for preview screen of font/display size settings Bug:
27699996
Change-Id: I57d61b0fffc8e4425e9d2348917d5aa385e1546b
Noah Wang [Wed, 30 Mar 2016 20:06:33 +0000 (20:06 +0000)]
Merge "Adding contentDescription to ViewPager in font/display size settings. Bug:
27326035" into nyc-dev
am:
1308bd8
* commit '
1308bd8bb1f1223c57a867246542ec22d7f9ef53':
Adding contentDescription to ViewPager in font/display size settings. Bug:
27326035
Change-Id: I73c5c49f685670b7a5f91c46dde0ac693f1d5fa2
Noah Wang [Wed, 30 Mar 2016 20:06:33 +0000 (20:06 +0000)]
Merge "Set minimum height for preview screen of font/display size settings Bug:
27699996" into nyc-dev
am:
bcf590c
* commit '
bcf590c88ad07865f20e5b1500f3815c03a32cb9':
Set minimum height for preview screen of font/display size settings Bug:
27699996
Change-Id: I2875bbb371f8426aac82b13c8be871476cc43200
Udam Saini [Wed, 30 Mar 2016 20:05:45 +0000 (20:05 +0000)]
Merge "Wait for fingerprints to be removed (Partial fix)." into nyc-dev
Jason Monk [Wed, 30 Mar 2016 20:05:29 +0000 (16:05 -0400)]
Add metrics for suggestions
Bug:
27851236
Change-Id: Ia5aa1d42a40ba09a19db3c3790f0a7342660e613
Noah Wang [Wed, 30 Mar 2016 20:03:38 +0000 (20:03 +0000)]
Merge "Adding contentDescription to ViewPager in font/display size settings. Bug:
27326035" into nyc-dev
Noah Wang [Wed, 30 Mar 2016 20:03:13 +0000 (20:03 +0000)]
Merge "Set minimum height for preview screen of font/display size settings Bug:
27699996" into nyc-dev
Jason Monk [Wed, 30 Mar 2016 19:46:26 +0000 (15:46 -0400)]
Add metrics for settings conditionals
Bug:
27851236
Change-Id: I400716457d3f628419410a02c2a457d41d19a067
Jason Monk [Wed, 30 Mar 2016 19:28:16 +0000 (19:28 +0000)]
Merge "Fix keywords for default home app" into nyc-dev am:
c6aa18b
am:
22e2ee8
* commit '
22e2ee8638a057b5fe6e1683b4b3d3e02fd60210':
Fix keywords for default home app
Change-Id: I7e1efd4a23a8c1b9db50ab254e792b184d17acfb
Jason Monk [Wed, 30 Mar 2016 19:28:16 +0000 (19:28 +0000)]
Merge "Only show enabled/disabled filters in main app list" into nyc-dev am:
800c912
am:
99d3d5c
* commit '
99d3d5ccf2ab7d7acfab7d6ee1af7818edccd624':
Only show enabled/disabled filters in main app list
Change-Id: I11bcdc9761574e853bb930fc946ec3877ea81014
Jason Monk [Wed, 30 Mar 2016 19:21:44 +0000 (19:21 +0000)]
Merge "Fix keywords for default home app" into nyc-dev
am:
c6aa18b
* commit '
c6aa18bcd96ba5085153ad46bcf187dfe3c009f5':
Fix keywords for default home app
Change-Id: I5dcdafcba6be8549d8ee874b131d99532959adbb
Jason Monk [Wed, 30 Mar 2016 19:21:43 +0000 (19:21 +0000)]
Merge "Only show enabled/disabled filters in main app list" into nyc-dev
am:
800c912
* commit '
800c912f7a8ade7cb9fd501c97c57bd946b4374d':
Only show enabled/disabled filters in main app list
Change-Id: I986446866b88a744efe20102466b568f24614d54
Jason Monk [Wed, 30 Mar 2016 19:11:18 +0000 (19:11 +0000)]
Merge "Fix keywords for default home app" into nyc-dev
Jason Monk [Wed, 30 Mar 2016 19:09:20 +0000 (15:09 -0400)]
Fix keywords for default home app
Change-Id: I38851f70d34168f906cf9b7223772bb3442852db
Fixes:
27826745
Jason Monk [Wed, 30 Mar 2016 18:53:31 +0000 (18:53 +0000)]
Merge "Only show enabled/disabled filters in main app list" into nyc-dev
Jason Monk [Wed, 30 Mar 2016 18:51:52 +0000 (14:51 -0400)]
Only show enabled/disabled filters in main app list
Change-Id: I8d7c94098b71f5893b08786a4caa90d9c191da99
Fixes:
27921850
Yohei Yukawa [Wed, 30 Mar 2016 18:45:00 +0000 (11:45 -0700)]
Remove gear icon from InputMethodPreference.
Per comment from UX, we do not show gear icons on InputMethodPreference
because there is no difference between tapping the item itself and
tapping the gear icon.
Bug:
27543291
Change-Id: Ieea9a13a4b7af9c90c3a2a8f365bd318663998b1
Yohei Yukawa [Wed, 30 Mar 2016 18:40:30 +0000 (11:40 -0700)]
Update title to "Add or edit virtual keyboards".
Per comment from UX, we replace "Add virtual keyboard" with
"Add or edit virtual keyboards" because the user is able to not only
enable but also disable virtual keyboards.
Bug:
27543291
Change-Id: Id2ae61519152bbe622aa5915f728a4cbbc49e078
Jason Monk [Wed, 30 Mar 2016 17:48:27 +0000 (17:48 +0000)]
Merge "Fix bridged app list saved scroll state" into nyc-dev am:
a9537a5
am:
df22fc5
* commit '
df22fc52a253d98ba0f180931b2f1a5c2daa359a':
Fix bridged app list saved scroll state
Change-Id: I31e6244f057306306fd66af003fcb1cc1380bb98
Muyuan Li [Wed, 30 Mar 2016 17:48:27 +0000 (17:48 +0000)]
Intent to start app memory usage page. am:
ba115af
am:
b69a359
* commit '
b69a359f49dc5b474f6f313558042b377bf3aaa4':
Intent to start app memory usage page.
Change-Id: I87f7252ee1e0d637b26afa037e5678af09c53cfd
Jason Monk [Wed, 30 Mar 2016 17:44:07 +0000 (17:44 +0000)]
Merge "Fix bridged app list saved scroll state" into nyc-dev
am:
a9537a5
* commit '
a9537a57d59a1b79b999655494af713048f051e9':
Fix bridged app list saved scroll state
Change-Id: Ia28306bc196abd0764bde0e40c4dd928a5d2aafa
Muyuan Li [Wed, 30 Mar 2016 17:44:07 +0000 (17:44 +0000)]
Intent to start app memory usage page.
am:
ba115af
* commit '
ba115afd52dea0c2db6966748d4cb3b9ff262880':
Intent to start app memory usage page.
Change-Id: I8ab11e9ed73b668ba47752bc87a578c9237b0e35
Jason Monk [Wed, 30 Mar 2016 17:26:55 +0000 (17:26 +0000)]
Merge "Fix bridged app list saved scroll state" into nyc-dev
Jason Monk [Wed, 30 Mar 2016 17:24:37 +0000 (13:24 -0400)]
Fix bridged app list saved scroll state
(don't clear the list when we have the info)
Fixes:
27185911
Change-Id: Ieda4fd0fc6dd662741da9a1805c1435d4473490d
Muyuan Li [Fri, 25 Mar 2016 22:46:12 +0000 (15:46 -0700)]
Intent to start app memory usage page.
Start the app with intent: android.settings.APP_MEMORY_USAGE will bring
up this page.
Bug:
26820467
Change-Id: I50690c71e8182735ea14fdf42a4812573f650e1b
(cherry picked from commit
b816812a4f68a1841703da5d29b32ccafd0896f6)
Jason Monk [Wed, 30 Mar 2016 16:58:09 +0000 (12:58 -0400)]
resolve merge conflicts of
4038f15 to master
Change-Id: Ifae7060ab23ad7619a5fdd01315a2d3e7c8a3845
Amith Yamasani [Wed, 30 Mar 2016 16:52:33 +0000 (09:52 -0700)]
Don't prompt twice to uninstall updates
PackageInstaller is going to ask again, so skip
asking in Settings when user wants to uninstall
updates to a system app.
Bug:
26694521
Change-Id: I4335a4e9bfe54985eb58ba19a890caba06705bef
Jason Monk [Wed, 30 Mar 2016 16:43:54 +0000 (16:43 +0000)]
Merge "Fix sim pin settings" into nyc-dev
am:
aafabba
* commit '
aafabbabab3771b89944ea2a7aea2b4f7b8ba071':
Fix sim pin settings
Change-Id: I26a86f87522a50933d8d7a293b1b3c9089043f4c
Jason Monk [Wed, 30 Mar 2016 16:39:51 +0000 (16:39 +0000)]
Merge "Revert "Rename more to other networks"" into nyc-dev am:
fd91887
am:
79a6273
* commit '
79a6273c314ead12890a43dba7fd5287614ed35b':
Revert "Rename more to other networks"
Change-Id: I5d9f42aceab52dc108e6141e92bf629f440f6441
Jason Monk [Wed, 30 Mar 2016 16:36:26 +0000 (16:36 +0000)]
Merge "Fix sim pin settings" into nyc-dev
Jason Monk [Wed, 30 Mar 2016 16:35:49 +0000 (16:35 +0000)]
Merge "Revert "Rename more to other networks"" into nyc-dev
am:
fd91887
* commit '
fd918873110586911ea7dd3cab526088114fed7e':
Revert "Rename more to other networks"
Change-Id: I022c8d2570b1c6d1e9ce58328048e4354e2114ae
Jason Monk [Wed, 30 Mar 2016 16:31:34 +0000 (16:31 +0000)]
Merge "Revert "Rename more to other networks"" into nyc-dev
Yohei Yukawa [Wed, 30 Mar 2016 16:25:17 +0000 (16:25 +0000)]
Merge "Use word "languages" in favor of multi-locale support." into nyc-dev am:
d719ae8
am:
b23838b
* commit '
b23838b3792523862a0cba582b3256b6d52dd5f0':
Use word "languages" in favor of multi-locale support.
Change-Id: I9337e0ae6710d45a267663b2bb1ce48bc81d80b3
Jason Monk [Wed, 30 Mar 2016 15:41:45 +0000 (11:41 -0400)]
Fix sim pin settings
Change-Id: I8fba2a367958da5831efd04f599ba7a363d11a1f
Fixes:
27419276
Fixes:
27529989
Yohei Yukawa [Wed, 30 Mar 2016 06:09:04 +0000 (06:09 +0000)]
Merge "Use word "languages" in favor of multi-locale support." into nyc-dev
am:
d719ae8
* commit '
d719ae8e37345f2e789d4a30932f3bfd9334817a':
Use word "languages" in favor of multi-locale support.
Change-Id: I8c4a4abe8f4e6c1ec959b7c59efa555b3e0436cb
Yohei Yukawa [Wed, 30 Mar 2016 06:00:24 +0000 (06:00 +0000)]
Merge "Use word "languages" in favor of multi-locale support." into nyc-dev
Noah Wang [Wed, 30 Mar 2016 04:32:18 +0000 (21:32 -0700)]
Adding contentDescription to ViewPager in font/display size settings.
Bug:
27326035
Change-Id: I416c05f2fc7c9238a61b8d512f09cb834f8ec537
Noah Wang [Wed, 30 Mar 2016 04:02:37 +0000 (21:02 -0700)]
Set minimum height for preview screen of font/display size settings
Bug:
27699996
Change-Id: I1e2e16a355993f058301c57d29857f6fca8ec858
Yohei Yukawa [Wed, 30 Mar 2016 03:44:01 +0000 (20:44 -0700)]
Use word "languages" in favor of multi-locale support.
In Android N, the user is able to select multiple languages. Hence
in the IME subtype enabler "Use system language" should be updated to
"Use system languages".
Bug:
27722513
Change-Id: Idcc2fa7eecd1316feac04774ff18c42614a0dc9a
Noah Wang [Wed, 30 Mar 2016 03:23:29 +0000 (20:23 -0700)]
Fix crashing of font size settings screen due to the timing
of initialization of ExploreByTouchHelper
Bug:
27674946
Change-Id: Ief92b5db975861aa31029712854e78edf4454eb5
Christopher Tate [Wed, 30 Mar 2016 00:42:53 +0000 (00:42 +0000)]
Merge "Improve notes on "Opening links" and related strings" into nyc-dev am:
dafc5df
am:
87df81e
* commit '
87df81ec238d9fc131eb0c2e26f2639f3560a28f':
Improve notes on "Opening links" and related strings
Change-Id: Ie65e034563031099a8b7e91d745c3b7f8141a70f
Mihai Nita [Wed, 30 Mar 2016 00:42:53 +0000 (00:42 +0000)]
Merge "Fix locale reorder jank" into nyc-dev am:
0189850
am:
0a7d2f8
* commit '
0a7d2f8a1a175a35d94c3c39c08875b7e4507010':
Fix locale reorder jank
Change-Id: I0ff66863afda688d8683f4b0e3393bf07fc81256
Daichi Hirono [Wed, 30 Mar 2016 00:38:52 +0000 (09:38 +0900)]
Change the dialog text in USB device tyep chooser.
Updates the texts to the new ones from UX.
Change-Id: Id741a9685c230e005019fe4b57933617fa67d257
Fixed:
27843605
Christopher Tate [Wed, 30 Mar 2016 00:28:54 +0000 (00:28 +0000)]
Merge "Improve notes on "Opening links" and related strings" into nyc-dev
am:
dafc5df
* commit '
dafc5df280bcd6912a06f2861f07691906ffe1c0':
Improve notes on "Opening links" and related strings
Change-Id: I1a6c2f35174c1da55a8e83bc15ec09e370f6f515
Mihai Nita [Wed, 30 Mar 2016 00:28:53 +0000 (00:28 +0000)]
Merge "Fix locale reorder jank" into nyc-dev
am:
0189850
* commit '
018985064d938b36c125ac1bdac73a9208e5da9f':
Fix locale reorder jank
Change-Id: I97c86470f1530f5b3da130ce22631cf1d6a186c0
Chris Tate [Wed, 30 Mar 2016 00:13:58 +0000 (00:13 +0000)]
Merge "Improve notes on "Opening links" and related strings" into nyc-dev
Christopher Tate [Wed, 30 Mar 2016 00:09:41 +0000 (17:09 -0700)]
Improve notes on "Opening links" and related strings
Bug
27857777
Change-Id: Ie4c70bca29c7b93c6bb9989b3bb3dc80bae6d805
Mihai Niță [Tue, 29 Mar 2016 23:33:21 +0000 (23:33 +0000)]
Merge "Fix locale reorder jank" into nyc-dev
Udam Saini [Tue, 29 Mar 2016 21:38:30 +0000 (14:38 -0700)]
Wait for fingerprints to be removed (Partial fix).
This is a partial fix for b/
27903189.
When we remove the lock screen and remove all fingerprints, wait for
them to all be removed before finishing the activity. This will let
the security screen accurately show how many fingerprints are available.
bug:
27903189
Change-Id: I30908dbefb7a858f6d99e532841ed4ff894bfe62
OSDN Git Service
