OSDN Git Service
Maurice Lam [Fri, 13 May 2016 01:02:15 +0000 (01:02 +0000)]
Merge "[ScreenLock] Use requested quality for encryption popup" into nyc-dev am:
102b368172
am:
1bc12ee9c2
* commit '
1bc12ee9c25ea42c660d11244b8ff9a0c03ba3c0':
[ScreenLock] Use requested quality for encryption popup
Change-Id: Ic93f54828b93bd167c73de8736b02345a45639e8
Maurice Lam [Fri, 13 May 2016 00:59:26 +0000 (00:59 +0000)]
Merge "[ScreenLock] Use requested quality for encryption popup" into nyc-dev
am:
102b368172
* commit '
102b368172b4e8201b32efb686b3f3334e5ddbda':
[ScreenLock] Use requested quality for encryption popup
Change-Id: I9373cd533e57006e71e9ea7df064f203994c7217
Maurice Lam [Fri, 13 May 2016 00:51:09 +0000 (00:51 +0000)]
Merge "[ScreenLock] Use requested quality for encryption popup" into nyc-dev
Maurice Lam [Thu, 12 May 2016 23:24:41 +0000 (16:24 -0700)]
[ScreenLock] Use requested quality for encryption popup
Use the requested password quality instead of the currently-in-use
password quality because encryption interstitial is shown before
the lock type is updated.
Bug:
28326234
Change-Id: I9ae950bab48f62033c59b582218c8a586f5b71ba
Adrian Roos [Thu, 12 May 2016 21:06:14 +0000 (21:06 +0000)]
Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev am:
ef505d628a
am:
e7c67aae22
* commit '
e7c67aae2253dc67df10270f1edd5e33aca43714':
Change-Id: Ibb6f3795656ebf7a359350d8ac37b0d29ec15597
Adrian Roos [Thu, 12 May 2016 21:02:28 +0000 (21:02 +0000)]
Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev am:
ef505d628a
am:
1d1ca8e590
* commit '
1d1ca8e5905c100efde0ffdfcc8b1dcc7dbc32c8':
Allow DPMs to restrict Remote Input on Keyguard
Change-Id: I2e2310c09f240beb92146d8d24c4bc6fdc413364
Adrian Roos [Thu, 12 May 2016 21:00:03 +0000 (21:00 +0000)]
Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev
am:
ef505d628a
* commit '
ef505d628ae96f175fca871013da8c24271667dc':
Allow DPMs to restrict Remote Input on Keyguard
Change-Id: Ieaa1f148c3db5fc41e1bb51faf987eac1b896bd4
Adrian Roos [Thu, 12 May 2016 20:59:47 +0000 (20:59 +0000)]
Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev
am:
ef505d628a
* commit '
ef505d628ae96f175fca871013da8c24271667dc':
Allow DPMs to restrict Remote Input on Keyguard
Change-Id: I5746a924564e8eb866b0c0e0a1e0205a38896f89
Adrian Roos [Thu, 12 May 2016 20:52:24 +0000 (20:52 +0000)]
Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev
Adrian Roos [Wed, 11 May 2016 19:49:20 +0000 (15:49 -0400)]
Allow DPMs to restrict Remote Input on Keyguard
Change-Id: I84b90b4047129794f1397351f9c8624f0048ad41
Fixes:
26981262
Fan Zhang [Thu, 12 May 2016 18:51:10 +0000 (18:51 +0000)]
Merge "Update suggestion/support UI to use more negative space." into nyc-mr1-dev
am:
f5746f9078
* commit '
f5746f90781c40380f8ec3057abcf9c67d830882':
Update suggestion/support UI to use more negative space.
Change-Id: Ie1f58f267b284735b7f2c86741a516d385f07530
Fan Zhang [Thu, 12 May 2016 18:41:10 +0000 (18:41 +0000)]
Merge "Update suggestion/support UI to use more negative space." into nyc-mr1-dev
Fan Zhang [Thu, 5 May 2016 00:33:25 +0000 (17:33 -0700)]
Update suggestion/support UI to use more negative space.
Bug:
28435214
-- Tweaked layout and padding in suggestions and support tab.
-- Added support to show different text color in SlidingTabLayout.
Change-Id: If5d90ec5360e35565176aae7475e355c27fcef7c
Android Build Merger (Role) [Thu, 12 May 2016 17:58:43 +0000 (17:58 +0000)]
Merge "Merge "Update lock timeout value after pref change." into nyc-dev am:
1590b8c005 am:
d9dffc6080" into nyc-mr1-dev-plus-aosp
Julia Reynolds [Thu, 12 May 2016 17:58:30 +0000 (17:58 +0000)]
Merge "Update lock timeout value after pref change." into nyc-dev am:
1590b8c005
am:
9e38c73cd2
* commit '
9e38c73cd268d47be7864fe3da23d02d9506ca6e':
Update lock timeout value after pref change.
Change-Id: I272dd4d3c5f5746eb4c3c9c6d5870c54402ae511
Julia Reynolds [Thu, 12 May 2016 17:58:29 +0000 (17:58 +0000)]
Merge "Update lock timeout value after pref change." into nyc-dev am:
1590b8c005
am:
d9dffc6080
* commit '
d9dffc608099297fbadabc1f9f72659955de5707':
Update lock timeout value after pref change.
Change-Id: I452876b5de56f10bd737bfe2f9b496420c82f369
Julia Reynolds [Thu, 12 May 2016 17:55:56 +0000 (17:55 +0000)]
Merge "Update lock timeout value after pref change." into nyc-dev
am:
1590b8c005
* commit '
1590b8c0055057a392883fe891d21fc659b60813':
Update lock timeout value after pref change.
Change-Id: Ib9da57d196586c76133dd25e918c92c05bc08eba
Julia Reynolds [Thu, 12 May 2016 17:55:56 +0000 (17:55 +0000)]
Merge "Update lock timeout value after pref change." into nyc-dev
am:
1590b8c005
* commit '
1590b8c0055057a392883fe891d21fc659b60813':
Update lock timeout value after pref change.
Change-Id: Ie86247323910b78fe0623a011f677b4e4fd148d2
Julia Reynolds [Thu, 12 May 2016 17:53:26 +0000 (17:53 +0000)]
Merge "Update lock timeout value after pref change." into nyc-dev
Android Build Merger (Role) [Thu, 12 May 2016 17:51:02 +0000 (17:51 +0000)]
Merge "Merge "Set Wi-Fi dialog spinners to 48dps tall" into nyc-dev am:
aead073d44 am:
d0035fd621" into nyc-mr1-dev-plus-aosp
Maurice Lam [Thu, 12 May 2016 17:50:46 +0000 (17:50 +0000)]
Merge "Set Wi-Fi dialog spinners to 48dps tall" into nyc-dev am:
aead073d44
am:
d0035fd621
* commit '
d0035fd621f10cb6a54f32a34c304c7e079f8497':
Set Wi-Fi dialog spinners to 48dps tall
Change-Id: I56ce3fa9a7b9b3e2ab4f5610bda75433635fa818
Maurice Lam [Thu, 12 May 2016 17:50:44 +0000 (17:50 +0000)]
Merge "Set Wi-Fi dialog spinners to 48dps tall" into nyc-dev am:
aead073d44
am:
3fdb526bbd
* commit '
3fdb526bbd7959ea5959922d86387232063b91a9':
Set Wi-Fi dialog spinners to 48dps tall
Change-Id: Ib86a8883fd042f796fa83e9a9b341c94efea89a6
Julia Reynolds [Thu, 12 May 2016 17:48:34 +0000 (13:48 -0400)]
Update lock timeout value after pref change.
Change-Id: I0d16256cb61e2db481d99349cd49c17e51de7c87
Fixes:
28734916
Maurice Lam [Thu, 12 May 2016 17:47:46 +0000 (17:47 +0000)]
Merge "Set Wi-Fi dialog spinners to 48dps tall" into nyc-dev
am:
aead073d44
* commit '
aead073d4494c6b764cb384cdb96c79ec5a37aa5':
Set Wi-Fi dialog spinners to 48dps tall
Change-Id: I66c985b54718ff2a6e66b54ba67d4ccae44a09c6
Maurice Lam [Thu, 12 May 2016 17:47:45 +0000 (17:47 +0000)]
Merge "Set Wi-Fi dialog spinners to 48dps tall" into nyc-dev
am:
aead073d44
* commit '
aead073d4494c6b764cb384cdb96c79ec5a37aa5':
Set Wi-Fi dialog spinners to 48dps tall
Change-Id: I130a82b74299ec5f358f6040e54974e4661e6dbb
Maurice Lam [Thu, 12 May 2016 17:42:19 +0000 (17:42 +0000)]
Merge "Set Wi-Fi dialog spinners to 48dps tall" into nyc-dev
Android Build Merger (Role) [Thu, 12 May 2016 13:31:50 +0000 (13:31 +0000)]
Merge "Merge "Disable WebViewSetting for non-admin users." into nyc-dev am:
f76993a9da am:
6e9836845f" into nyc-mr1-dev-plus-aosp
Gustav Sennton [Thu, 12 May 2016 13:31:40 +0000 (13:31 +0000)]
Merge "Disable WebViewSetting for non-admin users." into nyc-dev am:
f76993a9da
am:
6e9836845f
* commit '
6e9836845f8193cd52590ebec402383f54a2a41e':
Disable WebViewSetting for non-admin users.
Change-Id: If043c6dc2eda02303cf0d1276f0f2ba24c1d671b
Gustav Sennton [Thu, 12 May 2016 13:31:39 +0000 (13:31 +0000)]
Merge "Disable WebViewSetting for non-admin users." into nyc-dev am:
f76993a9da
am:
04af74dae0
* commit '
04af74dae09735e8852214772f48bcd5445c3211':
Disable WebViewSetting for non-admin users.
Change-Id: Icd15a907afa9c1afdf38e6f5640b6fb584fb82d3
Gustav Sennton [Thu, 12 May 2016 13:29:11 +0000 (13:29 +0000)]
Merge "Disable WebViewSetting for non-admin users." into nyc-dev
am:
f76993a9da
* commit '
f76993a9da046ac762ef6cd39b7eb0baa81e8871':
Disable WebViewSetting for non-admin users.
Change-Id: Icc42bdd0c0737be358301a6697db05df079a3941
Gustav Sennton [Thu, 12 May 2016 13:29:11 +0000 (13:29 +0000)]
Merge "Disable WebViewSetting for non-admin users." into nyc-dev
am:
f76993a9da
* commit '
f76993a9da046ac762ef6cd39b7eb0baa81e8871':
Disable WebViewSetting for non-admin users.
Change-Id: I08f5f7888ee22844aed287d27458149875b0320f
Gustav Sennton [Thu, 12 May 2016 13:23:55 +0000 (13:23 +0000)]
Merge "Disable WebViewSetting for non-admin users." into nyc-dev
Gustav Sennton [Wed, 11 May 2016 11:31:40 +0000 (12:31 +0100)]
Disable WebViewSetting for non-admin users.
For an app to be able to know whether the WebViewSetting is enabled for
a user we disable the setting at boot for non-admin users. In this way
an app can call intent.resolveActivity[Info] for the WebViewSetting
intent to check whether the WebViewSetting is enabled before linking to
it.
Bug:
28034166
Change-Id: I33b3fa10a38f2a2600cddd0891ef746126abdd61
Jim Miller [Thu, 12 May 2016 02:27:04 +0000 (02:27 +0000)]
Merge "Show signal strength indication while in CryptKeeper" into nyc-dev am:
3086911e25
am:
975d4245b3
* commit '
975d4245b3a88ccb6e58123f6db1e5898caf79df':
Change-Id: I9c1e09d86e7d023e26900ec9a8a0948b9dc5cff7
Jim Miller [Thu, 12 May 2016 02:23:54 +0000 (02:23 +0000)]
Merge "Show signal strength indication while in CryptKeeper" into nyc-dev am:
3086911e25
am:
ee4865ba14
* commit '
ee4865ba1484a5da8a2d2022dfc1b4a4c3fedd9e':
Show signal strength indication while in CryptKeeper
Change-Id: I1f38358b45ef9f4043692860df0c194ab1ad8d61
Jim Miller [Thu, 12 May 2016 02:12:54 +0000 (02:12 +0000)]
Merge "Show signal strength indication while in CryptKeeper" into nyc-dev
am:
3086911e25
* commit '
3086911e2578ca7391c46f230edfb0f968dec38e':
Show signal strength indication while in CryptKeeper
Change-Id: I68e310a264404efe0f2839d6047e091925da8cb1
Jim Miller [Thu, 12 May 2016 02:06:50 +0000 (02:06 +0000)]
Merge "Show signal strength indication while in CryptKeeper" into nyc-dev
am:
3086911e25
* commit '
3086911e2578ca7391c46f230edfb0f968dec38e':
Show signal strength indication while in CryptKeeper
Change-Id: If8dcd37239bc2aedeb4fcc97da715c21b4d53639
Jim Miller [Thu, 12 May 2016 01:52:34 +0000 (01:52 +0000)]
Merge "Show signal strength indication while in CryptKeeper" into nyc-dev
Dianne Hackborn [Thu, 12 May 2016 01:14:41 +0000 (01:14 +0000)]
Merge "Fix issue #
28400000: Settings memory UI still showing z-ram..." into nyc-dev am:
2dec0c7839
am:
c55d3e0ee8
* commit '
c55d3e0ee88dc8a062d9fae96b5a129c7936f220':
Change-Id: Iccc8edd8b5cefdfde26a907ec969328b3494f8ef
Dianne Hackborn [Thu, 12 May 2016 01:12:44 +0000 (01:12 +0000)]
Merge "Fix issue #
28400000: Settings memory UI still showing z-ram..." into nyc-dev am:
2dec0c7839
am:
c553d79b39
* commit '
c553d79b39fc819279a57bd31e14b3cf9acb6a18':
Fix issue #
28400000: Settings memory UI still showing z-ram...
Change-Id: I8f828474689daad2e300bcb22b3a32b04af1f8fa
Dianne Hackborn [Thu, 12 May 2016 00:51:45 +0000 (00:51 +0000)]
Merge "Fix issue #
28400000: Settings memory UI still showing z-ram..." into nyc-dev
am:
2dec0c7839
* commit '
2dec0c7839784940601df3f2110a552a5cf73400':
Fix issue #
28400000: Settings memory UI still showing z-ram...
Change-Id: I6d31dd4cd2dc9c56bb0ee131e7de667d3e5cb6de
Dianne Hackborn [Thu, 12 May 2016 00:51:36 +0000 (00:51 +0000)]
Merge "Fix issue #
28400000: Settings memory UI still showing z-ram..." into nyc-dev
am:
2dec0c7839
* commit '
2dec0c7839784940601df3f2110a552a5cf73400':
Fix issue #
28400000: Settings memory UI still showing z-ram...
Change-Id: Id9e43e234b5aaac86dd94d36ccd051d22ad5bdd4
Dianne Hackborn [Thu, 12 May 2016 00:40:16 +0000 (00:40 +0000)]
Merge "Fix issue #
28400000: Settings memory UI still showing z-ram..." into nyc-dev
Maurice Lam [Tue, 10 May 2016 19:45:53 +0000 (12:45 -0700)]
Set Wi-Fi dialog spinners to 48dps tall
Set the minimum height to align with the accessibility guidelines
and to disable ripple projection.
Also adds scroll indicators to the scroll view.
Bug:
28683023
Change-Id: I24c58c0d6e8ef4b9efc8b3f877bcd659f42b6c6d
Dianne Hackborn [Wed, 11 May 2016 21:22:05 +0000 (14:22 -0700)]
Fix issue #
28400000: Settings memory UI still showing z-ram...
...but probably shouldn't.
Change-Id: I3becb68a9989d915d11439b7beec1fe262261f78
Maurice Lam [Wed, 11 May 2016 20:14:58 +0000 (20:14 +0000)]
Merge "Fix truncated text in pattern lock setup" into nyc-mr1-dev
am:
8b649c0558
* commit '
8b649c055859e9d67353980aaf1dd2c62bdcfe06':
Fix truncated text in pattern lock setup
Change-Id: I22db81a7c6ff572d0ebeb7998392da82d98234d2
Maurice Lam [Wed, 11 May 2016 20:05:18 +0000 (20:05 +0000)]
Merge "Fix truncated text in pattern lock setup" into nyc-mr1-dev
Sudheer Shanka [Wed, 11 May 2016 19:34:14 +0000 (19:34 +0000)]
Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev am:
938501cf76
am:
28c44ebf65
* commit '
28c44ebf65f1d0602b5956a328c1f2886ad92fd3':
Change-Id: Id2feb9a5b493ed2e1a86c6d7911ef4c726c8df8e
Sudheer Shanka [Wed, 11 May 2016 19:22:24 +0000 (19:22 +0000)]
Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev am:
938501cf76
am:
eeeb02fefb
* commit '
eeeb02fefbb8d8e3dbe70a8862cf21ac9ac55736':
Add policy transparency to app notification settings on lockscreen.
Change-Id: I46f14c2de931a132cc27bc678293f9e028812758
Sudheer Shanka [Wed, 11 May 2016 19:14:11 +0000 (19:14 +0000)]
Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev
am:
938501cf76
* commit '
938501cf7634843460b03b6fe954e927166e1257':
Add policy transparency to app notification settings on lockscreen.
Change-Id: I2aa5788fa98cf5ac128c161fcb0123b26eae1d7b
Sudheer Shanka [Wed, 11 May 2016 19:13:46 +0000 (19:13 +0000)]
Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev
am:
938501cf76
* commit '
938501cf7634843460b03b6fe954e927166e1257':
Add policy transparency to app notification settings on lockscreen.
Change-Id: I7d9b313218cce94d6711d4ffa5df9a3c99d391c0
Sudheer Shanka [Wed, 11 May 2016 19:04:19 +0000 (19:04 +0000)]
Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev
Jason Monk [Wed, 11 May 2016 18:23:49 +0000 (18:23 +0000)]
Merge "Fix unmount up button" into nyc-dev am:
7680871d92
am:
d88d281304
* commit '
d88d2813043075ad470898f0a053bd04a46bbe8d':
Change-Id: I52319c8d01a6a91d30f632554c24d52b5c1dd277
Maurice Lam [Tue, 10 May 2016 01:22:08 +0000 (18:22 -0700)]
Fix truncated text in pattern lock setup
Partially apply ag/708412 to the setup version of the layout. The
rest is not necessary because we assign a weight to the lock pattern
view as well.
Use the short header layout for screens smaller than sw360dp so that
there is more space for the pattern view.
Bug:
28663249
Change-Id: I8cda13834504a345046bc3bf6e0959d613597916
Maurice Lam [Wed, 11 May 2016 18:23:43 +0000 (18:23 +0000)]
Merge "Fix truncated text in pattern lock setup" into nyc-dev am:
353cdee69e
am:
96aaeafa91
* commit '
96aaeafa91f5702ec4c9d630465e03c8c56f4dd9':
Change-Id: I56dee241a7c696464ce0386ee3385327578075d1
Jason Monk [Wed, 11 May 2016 18:21:09 +0000 (18:21 +0000)]
Merge "Fix unmount up button" into nyc-dev am:
7680871d92
am:
29b86d10d5
* commit '
29b86d10d519a1a1620f42b83a0766246e286409':
Fix unmount up button
Change-Id: Ic666811fad5ed0b5512e9904d46158f61aee819a
Maurice Lam [Wed, 11 May 2016 18:21:02 +0000 (18:21 +0000)]
Merge "Fix truncated text in pattern lock setup" into nyc-dev am:
353cdee69e -s ours
am:
ac97181cbc
* commit '
ac97181cbc2e8b980f8cc9dd6615d38faff61dc7':
Fix truncated text in pattern lock setup
Change-Id: I5e12f0bd4e7353842d681fe306eb2816d4f332cf
Jason Monk [Wed, 11 May 2016 18:18:37 +0000 (18:18 +0000)]
Merge "Fix unmount up button" into nyc-dev
am:
7680871d92
* commit '
7680871d92cd9fa31a3f515d112767644745f26e':
Fix unmount up button
Change-Id: I4c803b0664abd85956b724b782820920dced6a31
Maurice Lam [Wed, 11 May 2016 18:18:19 +0000 (18:18 +0000)]
Merge "Fix truncated text in pattern lock setup" into nyc-dev
am:
353cdee69e -s ours
* commit '
353cdee69e492f4571025644009024e3a1b10898':
Fix truncated text in pattern lock setup
Change-Id: I3fb29ac80ad857c15128b14076f0c2bf79375ea1
Jason Monk [Wed, 11 May 2016 18:15:38 +0000 (18:15 +0000)]
Merge "Fix unmount up button" into nyc-dev
am:
7680871d92
* commit '
7680871d92cd9fa31a3f515d112767644745f26e':
Fix unmount up button
Change-Id: I5384e051aa9409b07af2a201f17244e91360003e
Maurice Lam [Wed, 11 May 2016 18:15:35 +0000 (18:15 +0000)]
Merge "Fix truncated text in pattern lock setup" into nyc-dev
am:
353cdee69e
* commit '
353cdee69e492f4571025644009024e3a1b10898':
Fix truncated text in pattern lock setup
Change-Id: I470a2267b051eb394ed95f9c7443786fbf911836
Jason Monk [Wed, 11 May 2016 18:04:57 +0000 (18:04 +0000)]
Merge "Fix unmount up button" into nyc-dev
Maurice Lam [Wed, 11 May 2016 18:04:26 +0000 (18:04 +0000)]
Merge "Fix truncated text in pattern lock setup" into nyc-dev
Jason Monk [Wed, 11 May 2016 17:53:13 +0000 (13:53 -0400)]
Fix unmount up button
Change-Id: I24b388079c438075e3a8652822e7a2fb84fec608
Fixes:
28704198
Android Build Merger (Role) [Wed, 11 May 2016 16:31:36 +0000 (16:31 +0000)]
Merge "Merge "Fix crash in not installed for this user apps" into nyc-dev am:
a188b2447f am:
2134be3239" into nyc-mr1-dev-plus-aosp
Jason Monk [Wed, 11 May 2016 16:31:25 +0000 (16:31 +0000)]
Merge "Fix crash in not installed for this user apps" into nyc-dev am:
a188b2447f
am:
3b533b98da
* commit '
3b533b98da67909c66448db99f4e7d239adf2f15':
Fix crash in not installed for this user apps
Change-Id: I29e5a40715d9d6f5a767fbdfdb46535bf67b23a7
Jason Monk [Wed, 11 May 2016 16:31:25 +0000 (16:31 +0000)]
Merge "Fix crash in not installed for this user apps" into nyc-dev am:
a188b2447f
am:
2134be3239
* commit '
2134be3239197f6ebc7372bacf5b1d8f2d49a516':
Fix crash in not installed for this user apps
Change-Id: I50183afac2db30ac8f0d94b201d44c013469e794
Jason Monk [Wed, 11 May 2016 16:28:48 +0000 (16:28 +0000)]
Merge "Fix crash in not installed for this user apps" into nyc-dev
am:
a188b2447f
* commit '
a188b2447fa6f1bcb7fbf8a32a2c7425e6e40a69':
Fix crash in not installed for this user apps
Change-Id: I177bc82e5d9848b9981a6ce0b1948094ae19d420
Jason Monk [Wed, 11 May 2016 16:28:48 +0000 (16:28 +0000)]
Merge "Fix crash in not installed for this user apps" into nyc-dev
am:
a188b2447f
* commit '
a188b2447fa6f1bcb7fbf8a32a2c7425e6e40a69':
Fix crash in not installed for this user apps
Change-Id: I98f79dc9c4cb315259c2057fc852237111495051
Jason Monk [Wed, 11 May 2016 16:19:04 +0000 (16:19 +0000)]
Merge "Fix crash in not installed for this user apps" into nyc-dev
Jason Monk [Wed, 11 May 2016 15:35:21 +0000 (15:35 +0000)]
Merge "Expose dialog for current webview setting." into nyc-dev am:
f9e62e8d34
am:
8b4fad811a
* commit '
8b4fad811a316f72241ee369e313498a51c7b524':
Change-Id: I7a286fec20c8971a23273f914201cecf6d72211f
Jason Monk [Wed, 11 May 2016 15:35:00 +0000 (15:35 +0000)]
Merge "Expose dialog for current webview setting." into nyc-dev am:
f9e62e8d34
am:
b98fd15589
* commit '
b98fd15589ef0d95108104b0b5dea66e3dca4578':
Expose dialog for current webview setting.
Change-Id: If4c1e7f93bdae4c0ed284dff2365cd614c671fcd
Jason Monk [Wed, 11 May 2016 15:33:31 +0000 (15:33 +0000)]
Merge "Expose dialog for current webview setting." into nyc-dev
am:
f9e62e8d34
* commit '
f9e62e8d3497ea4b738bf6c9a0c72a023eb5b217':
Expose dialog for current webview setting.
Change-Id: I6c80311b6c8b3e552d6a479d20e0e5d4748e67a6
Jason Monk [Wed, 11 May 2016 15:33:04 +0000 (11:33 -0400)]
Fix crash in not installed for this user apps
Change-Id: I96fa409c5a91cdb6758dbf81714c1c97e28f47b6
Fixes:
28637871
Jason Monk [Wed, 11 May 2016 15:32:47 +0000 (15:32 +0000)]
Merge "Expose dialog for current webview setting." into nyc-dev
am:
f9e62e8d34
* commit '
f9e62e8d3497ea4b738bf6c9a0c72a023eb5b217':
Expose dialog for current webview setting.
Change-Id: Icc624a2ad85a3e119fa5a9893fa89d02e3773b51
Jason Monk [Wed, 11 May 2016 15:27:36 +0000 (15:27 +0000)]
Merge "Expose dialog for current webview setting." into nyc-dev
Jason Monk [Fri, 6 May 2016 19:09:32 +0000 (15:09 -0400)]
Expose dialog for current webview setting.
Change-Id: I91c796b2c75c0ac8047ba0c2555a1036e8c6c616
Fixes:
28554048
Android Build Merger (Role) [Wed, 11 May 2016 15:19:01 +0000 (15:19 +0000)]
Merge "Merge "Protect against case when suggestions haven\'t loaded" into nyc-dev am:
76f95e82b8 am:
9137eca497" into nyc-mr1-dev-plus-aosp
Jason Monk [Wed, 11 May 2016 15:18:45 +0000 (15:18 +0000)]
Merge "Protect against case when suggestions haven\'t loaded" into nyc-dev am:
76f95e82b8
am:
f241ae5fcf
* commit '
f241ae5fcfdefd3b5ddb294c41f84c7deb6ef836':
Protect against case when suggestions haven't loaded
Change-Id: I784e069f98d348a1897891b61c1053af63b18dae
Jason Monk [Wed, 11 May 2016 15:18:43 +0000 (15:18 +0000)]
Merge "Protect against case when suggestions haven\'t loaded" into nyc-dev am:
76f95e82b8
am:
9137eca497
* commit '
9137eca497a70cb1f8af27b40e270b46cf51176f':
Protect against case when suggestions haven't loaded
Change-Id: I3b92a44a2595707413ee384b486e603c01cdac19
Jason Monk [Wed, 11 May 2016 15:16:02 +0000 (15:16 +0000)]
Merge "Protect against case when suggestions haven\'t loaded" into nyc-dev
am:
76f95e82b8
* commit '
76f95e82b861441bccb9f452fe77e1c47acc1d3c':
Protect against case when suggestions haven't loaded
Change-Id: Ia3da0b1f72ccd51c3c3d06839ff8a91e25b1479a
Jason Monk [Wed, 11 May 2016 15:16:01 +0000 (15:16 +0000)]
Merge "Protect against case when suggestions haven\'t loaded" into nyc-dev
am:
76f95e82b8
* commit '
76f95e82b861441bccb9f452fe77e1c47acc1d3c':
Protect against case when suggestions haven't loaded
Change-Id: Ie0bc3aa3e696efcec5560860284b457e636bd5bc
Jason Monk [Wed, 11 May 2016 15:06:04 +0000 (15:06 +0000)]
Merge "Protect against case when suggestions haven't loaded" into nyc-dev
Jason Monk [Wed, 11 May 2016 15:01:17 +0000 (11:01 -0400)]
Protect against case when suggestions haven't loaded
Change-Id: I7668ed8af3f1808b619f0fdbd77c2f85da98f607
Fixes:
28691636
Victor Chang [Wed, 11 May 2016 14:55:31 +0000 (14:55 +0000)]
Merge "Fix ConfirmCredential is not presented before trusting cert installed by PO/DO" into nyc-dev am:
e8c5eca02d
am:
38e54ae400
* commit '
38e54ae400fa27ef1813bf668aedb297b525e702':
Change-Id: Ia2cf207c4b239465e03546f8c05e960d31077dea
Victor Chang [Wed, 11 May 2016 14:54:44 +0000 (14:54 +0000)]
Merge "Fix ConfirmCredential is not presented before trusting cert installed by PO/DO" into nyc-dev am:
e8c5eca02d
am:
bf513e27ae
* commit '
bf513e27aec0295b8b99d45dd9d100709cff7f1f':
Fix ConfirmCredential is not presented before trusting cert installed by PO/DO
Change-Id: Ic5d3dd6f04449ecbc36b4a5069b161159e340759
Victor Chang [Wed, 11 May 2016 14:52:03 +0000 (14:52 +0000)]
Merge "Fix ConfirmCredential is not presented before trusting cert installed by PO/DO" into nyc-dev
am:
e8c5eca02d
* commit '
e8c5eca02dab28c7c3860660c9cc8d890ee5a638':
Fix ConfirmCredential is not presented before trusting cert installed by PO/DO
Change-Id: I033215096d347e4216fa55b913c8e612e0cb6496
Victor Chang [Wed, 11 May 2016 14:52:02 +0000 (14:52 +0000)]
Merge "Fix ConfirmCredential is not presented before trusting cert installed by PO/DO" into nyc-dev
am:
e8c5eca02d
* commit '
e8c5eca02dab28c7c3860660c9cc8d890ee5a638':
Fix ConfirmCredential is not presented before trusting cert installed by PO/DO
Change-Id: Ife7faac27689a9c364486930d1ecb5ed4cf741c0
Victor Chang [Wed, 11 May 2016 14:43:13 +0000 (14:43 +0000)]
Merge "Fix ConfirmCredential is not presented before trusting cert installed by PO/DO" into nyc-dev
Jason Monk [Wed, 11 May 2016 14:15:22 +0000 (14:15 +0000)]
Switch fragments to SettingsPreferenceFragment am:
019aad4c61
am:
113762f1dc
* commit '
113762f1dcf3afe84eb68d3bfae15cd3cd89f375':
Change-Id: Ibef663103ab5ad013e9906641a3f47b00af3c02e
Jason Monk [Wed, 11 May 2016 14:11:54 +0000 (14:11 +0000)]
Switch fragments to SettingsPreferenceFragment am:
019aad4c61
am:
7b1c5657d5
* commit '
7b1c5657d59db95ff968f665f9fd8a8654771757':
Switch fragments to SettingsPreferenceFragment
Change-Id: I9e5bd85e99d2accd53b5cb40195bc2f7d03ac2bc
Jason Monk [Wed, 11 May 2016 14:11:30 +0000 (14:11 +0000)]
Switch fragments to SettingsPreferenceFragment
am:
019aad4c61
* commit '
019aad4c61da0b358782bc3cc59cc2688bb84a39':
Switch fragments to SettingsPreferenceFragment
Change-Id: I108eb329457335ddeb2d79d7bd494fefbcc8d742
Jason Monk [Wed, 11 May 2016 14:09:51 +0000 (14:09 +0000)]
Switch fragments to SettingsPreferenceFragment
am:
019aad4c61
* commit '
019aad4c61da0b358782bc3cc59cc2688bb84a39':
Switch fragments to SettingsPreferenceFragment
Change-Id: I15c83cbcda1a8936f8944addd4d6e65ef47415fe
Victor Chang [Mon, 9 May 2016 15:13:10 +0000 (16:13 +0100)]
Fix ConfirmCredential is not presented before trusting cert installed by PO/DO
- Show ConfirmCredential in TrustedCredentialsSettings when Trust button is clicked
for the very first time since the activity launched
- Warning activity (work mode off, crpyto-aware) should not be shown when the activity is started. Also fixed it here.
Bug:
28619980
Change-Id: I084b70883c087376e437a9ad3238d7c3313a0a17
Jason Monk [Tue, 10 May 2016 17:27:20 +0000 (13:27 -0400)]
Switch fragments to SettingsPreferenceFragment
So all basic settings features are supported properly
Change-Id: I1702272cdbc6c13a5d3ca53840113169a37d4d20
Fixes:
28634520
Jason Monk [Wed, 11 May 2016 13:52:15 +0000 (13:52 +0000)]
Merge "Fix crash on rotate pointer speed" into nyc-dev am:
ab30931d41
am:
7cdfe9a6d8
* commit '
7cdfe9a6d8c8cbdced15bb1001ef0912424ad27c':
Change-Id: Ibb845db7176f6a46205f24d9734bce599b8675d2
Jason Monk [Wed, 11 May 2016 13:49:45 +0000 (13:49 +0000)]
Merge "Fix crash on rotate pointer speed" into nyc-dev am:
ab30931d41
am:
b88e4899ff
* commit '
b88e4899ffd6daa9d27cb42ddeae6afa3cfad111':
Fix crash on rotate pointer speed
Change-Id: I2431d97095b0a5011a2de512d9fdba04836bf1b3
Jason Monk [Wed, 11 May 2016 13:46:45 +0000 (13:46 +0000)]
Merge "Fix crash on rotate pointer speed" into nyc-dev
am:
ab30931d41
* commit '
ab30931d4156afb8ee56c8df3b48fad4703712a7':
Fix crash on rotate pointer speed
Change-Id: Id1745575e2210352ef4f4799e8a787f69ebe9b70
Jason Monk [Wed, 11 May 2016 13:46:42 +0000 (13:46 +0000)]
Merge "Fix crash on rotate pointer speed" into nyc-dev
am:
ab30931d41
* commit '
ab30931d4156afb8ee56c8df3b48fad4703712a7':
Fix crash on rotate pointer speed
Change-Id: I6c73b33e8da5260240c7b6a549151da95c926164
Jason Monk [Wed, 11 May 2016 13:36:53 +0000 (13:36 +0000)]
Merge "Fix crash on rotate pointer speed" into nyc-dev
OSDN Git Service
