Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
233,490 Commits 3 Branches 0 Tags
24dbb9a508d703862679294cbe201b9cd392ca0d
Commit Graph

60951 Commits

Author SHA1 Message Date
John Reck
9bf6280b7a Merge "Include containing window title in SurfaceView\'s title" into nyc-dev am: 182bd38430 
am: b707ce7837

* commit 'b707ce7837d471a79c100348db0af75e21a42513':
  Include containing window title in SurfaceView's title
 2016-02-12 22:36:18 +00:00
John Reck
b707ce7837 Merge "Include containing window title in SurfaceView\'s title" into nyc-dev 
am: 182bd38430

* commit '182bd384304c7b96b197298e5bc866858da01bf4':
  Include containing window title in SurfaceView's title
 2016-02-12 22:30:54 +00:00
John Reck
182bd38430 Merge "Include containing window title in SurfaceView's title" into nyc-dev 2016-02-12 22:24:01 +00:00
Adam Powell
32c6426930 Merge "ChooserActivity direct share jank fixes" into nyc-dev am: 5e6d6f5824 
am: 94cf50d1f5

* commit '94cf50d1f589ed94802ef51cd00c993813abf994':
  ChooserActivity direct share jank fixes
 2016-02-12 21:28:36 +00:00
Adam Powell
94cf50d1f5 Merge "ChooserActivity direct share jank fixes" into nyc-dev 
am: 5e6d6f5824

* commit '5e6d6f5824bf194e5466797c7ff741de5b8e49fb':
  ChooserActivity direct share jank fixes
 2016-02-12 21:22:18 +00:00
Adam Powell
5e6d6f5824 Merge "ChooserActivity direct share jank fixes" into nyc-dev 2016-02-12 21:14:39 +00:00
Aurimas Liutikas
eadaeee848 Merge "Start saving iconified state of SearchView." into nyc-dev am: 3043c7b19d 
am: f878fdd68a

* commit 'f878fdd68add8e38104e00c90eef6630eb41f52f':
  Start saving iconified state of SearchView.
 2016-02-12 21:11:54 +00:00
Aurimas Liutikas
f878fdd68a Merge "Start saving iconified state of SearchView." into nyc-dev 
am: 3043c7b19d

* commit '3043c7b19d873fdeb578fe84b003162fc85f923e':
  Start saving iconified state of SearchView.
 2016-02-12 21:06:12 +00:00
Aurimas Liutikas
3043c7b19d Merge "Start saving iconified state of SearchView." into nyc-dev 2016-02-12 20:58:05 +00:00
Julia Reynolds
463b8f9f31 Merge "Show topic settings inline if user has configured topics." into nyc-dev am: 597c6d8c5d 
am: acfdf4b6ee

* commit 'acfdf4b6eeb4c6dd03aa54afad7aeb885e26a21f':
  Show topic settings inline if user has configured topics.
 2016-02-12 20:46:04 +00:00
Julia Reynolds
acfdf4b6ee Merge "Show topic settings inline if user has configured topics." into nyc-dev 
am: 597c6d8c5d

* commit '597c6d8c5de14340550313607d0925b8ee40fea9':
  Show topic settings inline if user has configured topics.
 2016-02-12 20:40:37 +00:00
Julia Reynolds
597c6d8c5d Merge "Show topic settings inline if user has configured topics." into nyc-dev 2016-02-12 20:31:55 +00:00
Sunny Goyal
c7ccff4b20 Changing hashmaps to sparseArrays and other similar conversions 
Change-Id: I1905120a2dc109e8f383b973e599e2c23e005d0e
 2016-02-12 12:25:28 -08:00
Jorim Jaggi
e54ddd62cc Fix layout for full-screen floating windows am: 9f6798a936 
am: 0c1edad116

* commit '0c1edad1169938157e53df8ec0abd5c42100b2d3':
  Fix layout for full-screen floating windows
 2016-02-12 19:40:23 +00:00
Jorim Jaggi
0c1edad116 Fix layout for full-screen floating windows 
am: 9f6798a936

* commit '9f6798a9367cc6134f956c422107361db43c4212':
  Fix layout for full-screen floating windows
 2016-02-12 19:33:41 +00:00
Jorim Jaggi
9f6798a936 Fix layout for full-screen floating windows 
When the app doesn't set IN_SCREEN and INSET_DECOR but the window is
still full-screen, we force SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN but then
we still need to communicate the content insets to the DecorView.

In DecorView, we consume these insets in this mode and set it as
layout params so this behavior is completely transparent for the
app.

Bug: 26464646
Change-Id: Ib7332b845767a5bbc0266c380bf6240e322db943
 2016-02-12 19:31:07 +00:00
Adrian Roos
d2598d345b Add setting for allowing remote input from keyguard am: 3aec638a7b 
am: f86c39d1d7

* commit 'f86c39d1d7d4eadc40d34edb1b9e53969e130ee0':
  Add setting for allowing remote input from keyguard
 2016-02-12 19:29:48 +00:00
Adrian Roos
f86c39d1d7 Add setting for allowing remote input from keyguard 
am: 3aec638a7b

* commit '3aec638a7b7f7200f7c82bca527e6aec75440d82':
  Add setting for allowing remote input from keyguard
 2016-02-12 19:02:16 +00:00
Adrian Roos
3aec638a7b Add setting for allowing remote input from keyguard 
Bug: 26440855
Change-Id: I539b1c7ee6a874283df1104fe0743ef0495f9510
 2016-02-12 18:54:58 +00:00
Amith Yamasani
2d155ee9ca Merge "onAccountsUpdated shouldn\'t be called back after listener unregistered" am: b96673847a 
am: f2c5157919

* commit 'f2c51579194204f104c4f52ffb7143898d73d1fc':
  onAccountsUpdated shouldn't be called back after listener unregistered
 2016-02-12 18:02:42 +00:00
Amith Yamasani
f2c5157919 Merge "onAccountsUpdated shouldn\'t be called back after listener unregistered" 
am: b96673847a

* commit 'b96673847a4680c384b7335df37affc0bba36f3f':
  onAccountsUpdated shouldn't be called back after listener unregistered
 2016-02-12 17:58:47 +00:00
Sunny Goyal
dde1f57a74 Merge "Using AppWidgetHostView in RemoteViewsAdapter instead of managing the RemoteViews inflation itself" 2016-02-12 17:51:52 +00:00
Amith Yamasani
b96673847a Merge "onAccountsUpdated shouldn't be called back after listener unregistered" 2016-02-12 17:50:17 +00:00
Paul Miller
0b651a0096 Merge "Fail nicely in Activity.requestPermissions when requestCode < 0" 2016-02-12 17:41:32 +00:00
Julia Reynolds
fec58c263c Show topic settings inline if user has configured topics. 
Change-Id: Icf51faad61b3ae4261991691a1d679b190ea712a
 2016-02-12 11:42:02 -05:00
Ritesh Reddy
150249754c Merge "Stashing SyncSettings for accounts added aft SUW" into nyc-dev am: 9ca8ed9302 
am: 7db999afa8

* commit '7db999afa87cbeab98ae5b5f48280e27af6d85f8':
  Stashing SyncSettings for accounts added aft SUW
 2016-02-12 16:38:36 +00:00
Sunny Goyal
89699a2811 Using AppWidgetHostView in RemoteViewsAdapter instead of managing the RemoteViews inflation itself 
Change-Id: If6dd8a778096a07c58b543efe892bbffbe24098f
 2016-02-12 08:36:38 -08:00
Ritesh Reddy
7db999afa8 Merge "Stashing SyncSettings for accounts added aft SUW" into nyc-dev 
am: 9ca8ed9302

* commit '9ca8ed9302f7d257ad3779d6dab34da645bc16b7':
  Stashing SyncSettings for accounts added aft SUW
 2016-02-12 16:34:20 +00:00
Ritesh Reddy
ae0bcddc86 Stashing SyncSettings for accounts added aft SUW 
Stashing SyncSettings for accounts not added by SUW Restore time
and restoring these settings whenever the account is added.

Bug: 26181613
Change-Id: Ia83e3fd43385a05424a8991115aa21ac90f4cd49
 2016-02-12 15:49:01 +00:00
Kenny Guy
15f6de3dd2 Merge "Support FBE for managed profiles." into nyc-dev am: 716a9e1892 
am: 86dd0f2a9b

* commit '86dd0f2a9b907f2f8a9cdce2fc7f052916778cd7':
  Support FBE for managed profiles.
 2016-02-12 15:10:00 +00:00
Kenny Guy
86dd0f2a9b Merge "Support FBE for managed profiles." into nyc-dev 
am: 716a9e1892

* commit '716a9e189297beba9e2205a335614e1750b9fdd4':
  Support FBE for managed profiles.
 2016-02-12 15:07:08 +00:00
Kenny Guy
b1b302660c Support FBE for managed profiles. 
Allow launcher to see and attempt to launch non-crypto
aware application when profile is locked.
Hide unlock notification until parent user is unlocked.
Have unlock notitication use confirm credentials to unlock
the profile.
Updated notification strings as per suggestions in mocks
to make it clearer between users and profiles.

Bug: 27038260

Change-Id: If2d2c8148670d814544f4edd44193d15da32a289
 2016-02-12 14:29:37 +00:00
Clara Bayarri
c1a258c813 Merge "Add support for current failed lock attempts and max attempts" into nyc-dev am: 29b13190cd 
am: ecc95de0f3

* commit 'ecc95de0f33aa3e63d34ed0cd3fc4597b04c93be':
  Add support for current failed lock attempts and max attempts
 2016-02-12 14:04:13 +00:00
Clara Bayarri
ecc95de0f3 Merge "Add support for current failed lock attempts and max attempts" into nyc-dev 
am: 29b13190cd

* commit '29b13190cd57bd823eb803f6fca03f671a32a5fe':
  Add support for current failed lock attempts and max attempts
 2016-02-12 14:00:41 +00:00
Clara Bayarri
29b13190cd Merge "Add support for current failed lock attempts and max attempts" into nyc-dev 2016-02-12 13:54:10 +00:00
Clara Bayarri
51e41ad887 Add support for current failed lock attempts and max attempts 
This is needed from Settings to show a message informing the user
of the number of attempts before their work profile gets wiped
when using ConfirmDeviceCredentials.

Bug: 26677759
Change-Id: I4b16f7dc2f415d0ce0215a3b7a646f98fabece33
 2016-02-12 13:50:43 +00:00
Daniel U
7dacfc8b18 Merge "Adopt HTML/CSS color values in fromHtml()" into nyc-dev am: 43bb0a0643 
am: 02a87c17c2

* commit '02a87c17c2bf5c67088c2960a072db7331c37309':
  Adopt HTML/CSS color values in fromHtml()
 2016-02-12 11:32:25 +00:00
Daniel U
02a87c17c2 Merge "Adopt HTML/CSS color values in fromHtml()" into nyc-dev 
am: 43bb0a0643

* commit '43bb0a06434425555a869075f8f27dfc64548de0':
  Adopt HTML/CSS color values in fromHtml()
 2016-02-12 11:29:12 +00:00
Shweta Chahar
8328d11896 Merge "Remove higher speech rate settings." into nyc-dev am: 239f248280 
am: f43bddb87f

* commit 'f43bddb87f26f5079ebed3b4195595c8576ac335':
  Remove higher speech rate settings.
 2016-02-12 11:25:00 +00:00
Daniel U
43bb0a0643 Merge "Adopt HTML/CSS color values in fromHtml()" into nyc-dev 2016-02-12 11:24:56 +00:00
Shweta Chahar
f43bddb87f Merge "Remove higher speech rate settings." into nyc-dev 
am: 239f248280

* commit '239f248280f0d44e2cfd1279baa0819633a36156':
  Remove higher speech rate settings.
 2016-02-12 11:22:24 +00:00
Shweta Chahar
239f248280 Merge "Remove higher speech rate settings." into nyc-dev 2016-02-12 11:18:33 +00:00
Gustav Sennton
5409017a26 Merge "Move current WebView provider from Settings.Secure to Settings.Global" into nyc-dev am: 7a002a215d 
am: 2c952b18e4

* commit '2c952b18e47049a0fbc98fc3eb5f2d790dcd075e':
  Move current WebView provider from Settings.Secure to Settings.Global
 2016-02-12 10:41:25 +00:00
Gustav Sennton
2c952b18e4 Merge "Move current WebView provider from Settings.Secure to Settings.Global" into nyc-dev 
am: 7a002a215d

* commit '7a002a215db498d232100c0b227d145244a03412':
  Move current WebView provider from Settings.Secure to Settings.Global
 2016-02-12 10:38:44 +00:00
Gustav Sennton
7a002a215d Merge "Move current WebView provider from Settings.Secure to Settings.Global" into nyc-dev 2016-02-12 10:35:24 +00:00
Jorim Jaggi
736593e765 Merge "Handle light status bar for split-screen" into nyc-dev am: e26334ba1a 
am: aa836177c3

* commit 'aa836177c3c9a0eeef5d3419220693af48a1eb5e':
  Handle light status bar for split-screen
 2016-02-12 03:21:18 +00:00
Jorim Jaggi
aa836177c3 Merge "Handle light status bar for split-screen" into nyc-dev 
am: e26334ba1a

* commit 'e26334ba1a5c7880c67b931a6ca73941167712e9':
  Handle light status bar for split-screen
 2016-02-12 03:16:54 +00:00
Jorim Jaggi
e26334ba1a Merge "Handle light status bar for split-screen" into nyc-dev 2016-02-12 03:12:18 +00:00
Dianne Hackborn
f1c710b6ef Merge "Add separate information about user whitelist." 2016-02-12 01:14:28 +00:00
Winson Chung
b8a40f1331 Merge changes If90955f4,I9fa48c06,Ib4681a43 into nyc-dev am: 34f5c494df 
am: be0537a4e1

* commit 'be0537a4e133d29848efd2458acf12f995a5823b':
  Adding view debug annotations to simplifying debugging state.
  Disallow launching third party apps in safe mode.
  Drawing thumbnail background color for empty space in view.
 2016-02-12 01:08:38 +00:00