Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
246,497 Commits 3 Branches 0 Tags
ffe7746437e8f06cc7dd2571c3354973791c8a8a
Commit Graph

246497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
af5c50e1fa Add updated Test Support lib docs to reference. am: debd2a7d41 
am: 59df5b8029

* commit '59df5b8029d943e7a16922fdce65bda03ee3b4e4':
  Add updated Test Support lib docs to reference.

Change-Id: I7e88fd286122f8f1eff8457dc4748fc36d40b4fb
 2016-05-11 19:59:56 +00:00
Adrian Roos
7f06eed7f5 DPM control for remote input when locked 
Bug: 26981262
Change-Id: I84f26ebe807e89fd56ffc3bbc7fc20f12e2f7391
 2016-05-11 19:54:09 +00:00
Dirk Dougherty
3728c5b99e Merge "Add navtree for wearable support lib." into mnc-mr-docs 
am: 1e0d1c67b4

* commit '1e0d1c67b4f81b9a20a17673b6c4e2911ccb74e6':
  Add navtree for wearable support lib.

Change-Id: I96989cd75e4454e02b33769a43461cd698aba12a
 2016-05-11 19:53:10 +00:00
Dirk Dougherty
59df5b8029 Add updated Test Support lib docs to reference. 
am: debd2a7d41

* commit 'debd2a7d41a62161671caee333a06b337e35270d':
  Add updated Test Support lib docs to reference.

Change-Id: I441d3cddbc5dd1185e277f47b7387c4798f73442
 2016-05-11 19:52:36 +00:00
Dirk Dougherty
1e0d1c67b4 Merge "Add navtree for wearable support lib." into mnc-mr-docs 2016-05-11 19:42:58 +00:00
Dirk Dougherty
debd2a7d41 Add updated Test Support lib docs to reference. 
Change-Id: Ib572c99c07890a9b91aa53154d937ac45605d122
 2016-05-11 12:34:12 -07:00
Dirk Dougherty
0da6c2de9a Add navtree for wearable support lib. 
Change-Id: Ibc16e3752912ed0653e5ff192cd0983c681c4683
 2016-05-11 12:18:24 -07:00
Sudheer Shanka
24d8e86219 Merge "Move spinner_dropdown_restricted_item to Settings." into nyc-dev 
am: f7a2afb4fc

* commit 'f7a2afb4fce896f82ee9468825af51efb6cf7c05':
  Move spinner_dropdown_restricted_item to Settings.

Change-Id: I02b5a790cb4017173c57a33f07a8c37040a38ab5
 2016-05-11 19:12:28 +00:00
Sudheer Shanka
f7a2afb4fc Merge "Move spinner_dropdown_restricted_item to Settings." into nyc-dev 2016-05-11 19:04:20 +00:00
smain@google.com
3a741c11cb Merge "update uiautomator redirects as per https://critique.corp.google.com/#review/122073355" into mnc-mr-docs am: 60acc60b1e am: c332e02c5b am: 795b70f09c 
am: 2d36b0c238

* commit '2d36b0c2384a8b28fed7a5a7503f315bc3a43a20':
  update uiautomator redirects as per https://critique.corp.google.com/#review/122073355

Change-Id: I72796b652406e1d46976269d008d5a8fcabe202e
 2016-05-11 18:51:59 +00:00
smain@google.com
2d36b0c238 Merge "update uiautomator redirects as per https://critique.corp.google.com/#review/122073355" into mnc-mr-docs am: 60acc60b1e am: c332e02c5b 
am: 795b70f09c

* commit '795b70f09c2e37fa392a102b7e7e98970287cd2f':
  update uiautomator redirects as per https://critique.corp.google.com/#review/122073355

Change-Id: If66bc015ee7974f1373555360a5a49e6c875b87c
 2016-05-11 18:42:57 +00:00
smain@google.com
795b70f09c Merge "update uiautomator redirects as per https://critique.corp.google.com/#review/122073355" into mnc-mr-docs am: 60acc60b1e 
am: c332e02c5b

* commit 'c332e02c5b7c94c6367c0dbf66e5670571ee82de':
  update uiautomator redirects as per https://critique.corp.google.com/#review/122073355

Change-Id: I6465d1d88966af8b4d9aa9fcc47c02af158cd69e
 2016-05-11 18:36:32 +00:00
sreevanis
e2f4fa512e docs: Added new page and menu link for "Testing Apps for Auto". am: eb41bc08e1 am: a0598b5f06 am: 44b6976acf 
am: 52abf8d472

* commit '52abf8d472b511a19c5d457dab8a2ba6dea0c5a6':
  docs: Added new page and menu link for "Testing Apps for Auto".

Change-Id: I5d80de10c38f49ed5a025745197d06fddab9a039
 2016-05-11 18:32:17 +00:00
smain@google.com
c332e02c5b Merge "update uiautomator redirects as per https://critique.corp.google.com/#review/122073355" into mnc-mr-docs 
am: 60acc60b1e

* commit '60acc60b1e8c2343a7a8782f6f73ab6ea0fc0178':
  update uiautomator redirects as per https://critique.corp.google.com/#review/122073355

Change-Id: I300eacc2b64ea3a3f39c0922b9f032d1fef9397c
 2016-05-11 18:29:43 +00:00
sreevanis
52abf8d472 docs: Added new page and menu link for "Testing Apps for Auto". am: eb41bc08e1 am: a0598b5f06 
am: 44b6976acf

* commit '44b6976acf8a6588a68cdba2a9c6e2b1fb841dac':
  docs: Added new page and menu link for "Testing Apps for Auto".

Change-Id: Ifbac7b5836ff62b2a10b09199ad43542117f1f13
 2016-05-11 18:25:28 +00:00
sreevanis
44b6976acf docs: Added new page and menu link for "Testing Apps for Auto". am: eb41bc08e1 
am: a0598b5f06

* commit 'a0598b5f0678d3dc4b9862f2eb703d557897d670':
  docs: Added new page and menu link for "Testing Apps for Auto".

Change-Id: I5123cf06903f9f29eed467bed63884b504e93d40
 2016-05-11 18:21:37 +00:00
Scott Main
60acc60b1e Merge "update uiautomator redirects as per https://critique.corp.google.com/#review/122073355" into mnc-mr-docs 2016-05-11 18:21:05 +00:00
sreevanis
a0598b5f06 docs: Added new page and menu link for "Testing Apps for Auto". 
am: eb41bc08e1

* commit 'eb41bc08e118f257e83640aff95f80058e40ee21':
  docs: Added new page and menu link for "Testing Apps for Auto".

Change-Id: Iebaaf9bed31ac251d46a25e7ebccd77f17dbc741
 2016-05-11 18:18:08 +00:00
smain@google.com
7ba70c460f update uiautomator redirects 
as per https://critique.corp.google.com/#review/122073355

Change-Id: I42d21d67a5601b689cdf8ddb705b94d11ea90d2e
 2016-05-11 11:18:05 -07:00
Ricky Wai
3bb6351a4e Merge "Use userHandle not credentialOwnerUserId to check if it needs to show lock" into nyc-dev 
am: ca34ab06ec

* commit 'ca34ab06eca921f8c193dfa7d0b500b6892890e6':
  Use userHandle not credentialOwnerUserId to check if it needs to show lock

Change-Id: I0015c35a2f4b024c22f9bf2e2d43dc6ca25db046
 2016-05-11 17:56:35 +00:00
Phil Weaver
83fec00697 Fix a race in settings update. 
Need to invalidate caching before notifying of changes.

Bug: 28621277
Change-Id: I2820b15d2364ecaad7666a820c0c7280ac6b7b4c
 2016-05-11 10:55:29 -07:00
Amanda Kassay
9ded33a4c7 Merge "Deleting pages so redirects work on DevSite. b/28670825" into mnc-mr-docs am: 965f4bf1ef am: af218df0be am: 5295a81926 
am: c5484969b4

* commit 'c5484969b4e52e027bd92adec3486cbc5dd7737d':
  Deleting pages so redirects work on DevSite. b/28670825

Change-Id: I18d0d2423e29be4f61bb92f81b24502e223f33a5
 2016-05-11 17:52:44 +00:00
sreevanis
eb41bc08e1 docs: Added new page and menu link for "Testing Apps for Auto". 
Moved DHU contents from Tools location to the new "Testing for Auto"
location.

Bug:23587345
Change-Id: I70aa09fc1073f0801b1e69959fe39cf01558546e
 2016-05-11 10:50:45 -07:00
Ricky Wai
ca34ab06ec Merge "Use userHandle not credentialOwnerUserId to check if it needs to show lock" into nyc-dev 2016-05-11 17:50:34 +00:00
Amanda Kassay
c5484969b4 Merge "Deleting pages so redirects work on DevSite. b/28670825" into mnc-mr-docs am: 965f4bf1ef am: af218df0be 
am: 5295a81926

* commit '5295a81926321bcb7059f645728e021264131227':
  Deleting pages so redirects work on DevSite. b/28670825

Change-Id: I4cdefd1ed0a858404428058b46edaf2eabc3f752
 2016-05-11 17:49:55 +00:00
Amanda Kassay
5295a81926 Merge "Deleting pages so redirects work on DevSite. b/28670825" into mnc-mr-docs am: 965f4bf1ef 
am: af218df0be

* commit 'af218df0be999d5aa08e580fc237c35eecc11839':
  Deleting pages so redirects work on DevSite. b/28670825

Change-Id: Ie452073f4f159ea4210de3d8ff6c9a7a34a543fa
 2016-05-11 17:47:07 +00:00
Amanda Kassay
af218df0be Merge "Deleting pages so redirects work on DevSite. b/28670825" into mnc-mr-docs 
am: 965f4bf1ef

* commit '965f4bf1ef2e8958ec9a53bab00be919a49bc8c2':
  Deleting pages so redirects work on DevSite. b/28670825

Change-Id: If2a4f83aadd1994c86c34a9443cf50af96b633d6
 2016-05-11 17:44:06 +00:00
Ben Lin
10601fa8bd Merge "Removed duplicate call to Metric log, and using private logging method." into nyc-dev 
am: f2413b79c6

* commit 'f2413b79c6e8f0b23b84c08806cca9c8c01959b5':
  Removed duplicate call to Metric log, and using private logging method.

Change-Id: I9c2af4839ceb15559f8ff5154c84bb03442a441b
 2016-05-11 17:44:05 +00:00
Sid Soundararajan
ae36204824 Merge "Remove Graphic from No Recents Screen on TV." into nyc-dev 
am: 20ed211fbc

* commit '20ed211fbcac476f0b84e68b039f00a54e5c7351':
  Remove Graphic from No Recents Screen on TV.

Change-Id: I7241317e16ede52aebe46764b15599df2d4c4157
 2016-05-11 17:38:07 +00:00
Amanda Kassay
965f4bf1ef Merge "Deleting pages so redirects work on DevSite. b/28670825" into mnc-mr-docs 2016-05-11 17:37:46 +00:00
Ben Lin
f2413b79c6 Merge "Removed duplicate call to Metric log, and using private logging method." into nyc-dev 2016-05-11 17:36:26 +00:00
sergeyv
284b765e3c Draw textShadow always first. 
Interleaving text and shadow rendering resulted in issuing draw commands from FontRenderer::renderDropShadow.

bug: 28528923
Change-Id: Ife2677f58180aaf10ec74d7c6efe5c44fe248daa
 2016-05-11 10:30:14 -07:00
Sid Soundararajan
20ed211fbc Merge "Remove Graphic from No Recents Screen on TV." into nyc-dev 2016-05-11 17:29:31 +00:00
Julia Reynolds
47e0d29473 Merge "Do not bundle cross user." into nyc-dev 
am: 68a32b5aad

* commit '68a32b5aad77d0e85a877bf0b10caaf3e419d5b2':
  Do not bundle cross user.

Change-Id: I138954f6b417997fd2e6d7f8bd96e8c0ad7ff2a5
 2016-05-11 17:26:59 +00:00
Julia Reynolds
ea7a6db175 Merge "Swap radio button alphas." into nyc-dev 
am: 0ccd9cef14

* commit '0ccd9cef14c6804459cc1824a067afb2c7604e8e':
  Swap radio button alphas.

Change-Id: I1a52ed1fd9480e00cfc183524b55447717bb9c86
 2016-05-11 17:26:56 +00:00
Julia Reynolds
68a32b5aad Merge "Do not bundle cross user." into nyc-dev 2016-05-11 17:20:16 +00:00
Julia Reynolds
0ccd9cef14 Merge "Swap radio button alphas." into nyc-dev 2016-05-11 17:19:12 +00:00
Cheryl Potter
3455280b93 Merge "docs: Fix missing image in Android Monitor Overview card b/28704424" into mnc-mr-docs am: ae08263ac8 am: 5c273ba194 am: 1b59797ce5 
am: 838a8280f8

* commit '838a8280f83469e062316ae29a88559c98864454':
  docs: Fix missing image in Android Monitor Overview card b/28704424

Change-Id: I75df34722f452be960e31351b95036621895c659
 2016-05-11 17:18:50 +00:00
Cheryl Potter
838a8280f8 Merge "docs: Fix missing image in Android Monitor Overview card b/28704424" into mnc-mr-docs am: ae08263ac8 am: 5c273ba194 
am: 1b59797ce5

* commit '1b59797ce56e080847f6b635dc5e92707ac45fb4':
  docs: Fix missing image in Android Monitor Overview card b/28704424

Change-Id: I99842f49b7d7c927b8c720b3e161ec488c8c3cee
 2016-05-11 17:16:20 +00:00
Cheryl Potter
1b59797ce5 Merge "docs: Fix missing image in Android Monitor Overview card b/28704424" into mnc-mr-docs am: ae08263ac8 
am: 5c273ba194

* commit '5c273ba194deab8b0dc73b9632b936b7f088e7ac':
  docs: Fix missing image in Android Monitor Overview card b/28704424

Change-Id: I651132147c73a9b96373c688a34437bf1d557c87
 2016-05-11 17:13:34 +00:00
Cheryl Potter
5c273ba194 Merge "docs: Fix missing image in Android Monitor Overview card b/28704424" into mnc-mr-docs 
am: ae08263ac8

* commit 'ae08263ac81277ad25a84cc3a30917f8f78a3153':
  docs: Fix missing image in Android Monitor Overview card b/28704424

Change-Id: I59128f6ff32ffab60e5e1dd43d8008d7d7d470e8
 2016-05-11 17:10:48 +00:00
Cheryl Potter
ae08263ac8 Merge "docs: Fix missing image in Android Monitor Overview card b/28704424" into mnc-mr-docs 2016-05-11 17:07:59 +00:00
Selim Cinek
f91de68601 Fixed a bug where the QS was animating wrong when closing 
Because the overscroll flag was still set the animation could
be wrong.

Change-Id: I52adf744c92723590297844bbefef8ecf5c8d737
Fixes: 28511835
 2016-05-11 13:01:02 -04:00
Ricky Wai
9cc7ad65a1 Use userHandle not credentialOwnerUserId to check if it needs to show lock 
It is possible that unified keys stored in keystore is not migrated,
while work mode is off and upgrade happens.
At this moment, user not able to turn on work mode as work is not unlocked,
and user cannot unlock work as parent's has a challenge.
mLockPatternUtils.isSecure(userHandle) should be the same as
mLockPatternUtils.isSecure(credentialOwnerUserId), except it is a unified
lock and work profile does not setup a lock/key in keystore yet(migration).

Bug: 28689675
Change-Id: Ia0755caa10ff94a25cf26c3e5907ecd33abd866e
 2016-05-11 18:00:20 +01:00
Adrian Roos
e96abdba90 Merge "Force status bar window to be visible when expanded" into nyc-dev 
am: 4b4e814533

* commit '4b4e81453372a9b60acdc181f3bc39c49c97f999':
  Force status bar window to be visible when expanded

Change-Id: Iabdc2ca6cd0bab85fe9473b5f2f8e9eab3a7771c
 2016-05-11 16:54:09 +00:00
Robert Carr
965c343065 Merge "PopupWindow: Be more careful with FLAG_LAYOUT_NO_LIMITS" into nyc-dev 
am: a625b0b597

* commit 'a625b0b5976c17d8efabcf348613db7fda3e56cf':
  PopupWindow: Be more careful with FLAG_LAYOUT_NO_LIMITS

Change-Id: Ia2bb751cd9864ed10e5ee5d38c7bea4d91527b2e
 2016-05-11 16:48:28 +00:00
Amith Yamasani
636a6a1cae Merge "Reduce wtf spam when a service onDestroy races with proc death" into nyc-dev 
am: 319380226a

* commit '319380226ad4de0cffdb4f4da6abf5869702c49f':
  Reduce wtf spam when a service onDestroy races with proc death

Change-Id: I575fa867c448205296df942c2335afa972ed5baa
 2016-05-11 16:48:26 +00:00
TreeHugger Robot
4b4e814533 Merge "Force status bar window to be visible when expanded" into nyc-dev 2016-05-11 16:47:27 +00:00
Chris Wren
5ab5c748a8 document the return type of getImportance 
Bug: 28690726
Change-Id: I06508e9e7c38e26e84801b86d6974f01abf5dfc1
 2016-05-11 12:44:58 -04:00
Rob Carr
a625b0b597 Merge "PopupWindow: Be more careful with FLAG_LAYOUT_NO_LIMITS" into nyc-dev 2016-05-11 16:44:16 +00:00