Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
249,922 Commits 3 Branches 0 Tags
6501ac3bf9cfd8d940d2c36ab2df72bda1cab52e
Commit Graph

249922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Miao Wang
b02f7b0a0e Merge "[RenderScript] Interrupt mMessageThread when tearing down context." 
am: 9f2a1979a7

* commit '9f2a1979a750788f572709fe13c66a917ba8fdf8':
  [RenderScript] Interrupt mMessageThread when tearing down context.

Change-Id: Ie2b99b85e22b3e871111e33785565f8159939112
 2016-05-11 19:23:54 +00:00
Dirk Dougherty
0da6c2de9a Add navtree for wearable support lib. 
Change-Id: Ibc16e3752912ed0653e5ff192cd0983c681c4683
 2016-05-11 12:18:24 -07:00
Miao Wang
9f2a1979a7 Merge "[RenderScript] Interrupt mMessageThread when tearing down context." 2016-05-11 19:13:00 +00:00
Sudheer Shanka
63e3e038c4 Merge "Move spinner_dropdown_restricted_item to Settings." into nyc-dev 
am: f7a2afb4fc

* commit 'f7a2afb4fce896f82ee9468825af51efb6cf7c05':
  Move spinner_dropdown_restricted_item to Settings.

Change-Id: Iba68fd936e04ef4c736b7ab77dd3d6d8bd8810a7
 2016-05-11 19:12:38 +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
6be581cc23 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: I2cc70500bda3877000e2a383fed4c322be739bce
 2016-05-11 18:52:12 +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
3cacbe10b2 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: I11018e9ade219a8297914443c42cdddc172ab7f9
 2016-05-11 18:32:20 +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
1933de0f3e 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: Iee4270fa80efeb14bf4e56ad481f9982fbf3ff9c
 2016-05-11 17:56:43 +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
613ecde6a2 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: I47d881a1d6f1dc6d9327471f08fde5d8a7d24d2f
 2016-05-11 17:53:06 +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
6974295274 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: I497f0822da0d42d59b025623e61167aa5d157396
 2016-05-11 17:44:05 +00:00
Sid Soundararajan
85a0821914 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: I33b50a92e08f3ecf5c4fbd334ea989d50c7c075f
 2016-05-11 17:38:10 +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
b15ecad14c Merge "Do not bundle cross user." into nyc-dev 
am: 68a32b5aad

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

Change-Id: Ifa9198643939c69493a0ae406f48437d3bf94bd7
 2016-05-11 17:27:03 +00:00
Julia Reynolds
625f551851 Merge "Swap radio button alphas." into nyc-dev 
am: 0ccd9cef14

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

Change-Id: Ic725466efe7bf7871452caabee7ea24ff5fff131
 2016-05-11 17:26:59 +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
0c1063836f 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: I14ea4b7b7eb4a184a1b52f2ac6f52fdc00f4f0b9
 2016-05-11 17:18:52 +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
33f6c04283 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: Ib28bb434fc0d1c56772db3ec7b5d22bb25118f6d
 2016-05-11 16:54:11 +00:00
Robert Carr
e49ecf58e9 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: I84b8882069a36c8f625060cb82696660a0c9c681
 2016-05-11 16:48:32 +00:00
Amith Yamasani
2b38000a91 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: Ibcd7b1432c178499f7426008e744b84f43a75a43
 2016-05-11 16:48:28 +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
Amith Yamasani
319380226a Merge "Reduce wtf spam when a service onDestroy races with proc death" into nyc-dev 2016-05-11 16:44:08 +00:00
Torne (Richard Coles)
4c1639a578 Merge "Change webview developer setting string." into nyc-dev 
am: bf150eeb75

* commit 'bf150eeb752fd9126118c69411c4241e80718e87':
  Change webview developer setting string.

Change-Id: Iad9ab57f3a345ed0c7e72d458cb8ba01eb8fc938
 2016-05-11 16:23:15 +00:00
TreeHugger Robot
bf150eeb75 Merge "Change webview developer setting string." into nyc-dev 2016-05-11 16:16:31 +00:00
Diego Perez
04b0d780bc Merge "Fix VectorDrawable_Delegate and DrawerLayout" into nyc-dev 
am: 8fc7ca05e5

* commit '8fc7ca05e5ce3a8774be2abb0742b993431bff63':
  Fix VectorDrawable_Delegate and DrawerLayout

Change-Id: I2c438e5236346a2fa7147b7a9a88eaa2f4a67993
 2016-05-11 15:59:03 +00:00