Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
159,201 Commits 3 Branches 0 Tags
f1c91fec09c3ed9ec0dcafe10ed2942d91d2a975
Commit Graph

44883 Commits

Author SHA1 Message Date
Yorke Lee
84496c7706 am cca60741: am 60a3817c: Merge "API changes for ContactsContract" into lmp-dev 
* commit 'cca607410716197803663676526cf6368c58a7de':
  API changes for ContactsContract
 2014-08-27 04:20:06 +00:00
Jim Miller
d22a667731 Merge "Limit grantTrust() duration to DevicePolicy-imposed limit." into lmp-dev 2014-08-27 03:08:02 +00:00
Jim Miller
bde3d18dd5 Change name of confirm credentials method after API review 
Changed from getConfirmDeviceCredentialIntent to createConfirmDeviceCredentialIntent

Fixes bug 17288988

Change-Id: Iae9a997d9ea49ce23bdbbe38ad7b0763779b8f59
 2014-08-26 19:53:17 -07:00
Adam Powell
4902a89103 Merge "Adjust toolbar/action bar title handling" into lmp-dev 2014-08-27 01:31:18 +00:00
Adam Powell
af2d85973e Adjust toolbar/action bar title handling 
Treat activity title changes as window title changes when propagating
to action bars. This gives it lower priority if a "hard" title has
been set. Fix some lifecycle handling around this that previously
resulted in multiple calls.

Automatically detect the starting display options for a
ToolbarWidgetWrapper if we're not grabbing them from styles. This
prevents setTitle and friends from going totally out to lunch if
constructed around a Toolbar with no starting title.

Bug 17138048

Change-Id: I9f58a3d222546745c8aa873e996b8f0d52a0ad21
 2014-08-26 18:28:17 -07:00
Svetoslav
86b1df2343 Print services setting changes not handled for managed profiles. 
We keep per user settings for enabled print services which are
observed to update the print manager service state. We were listening
to all user changes but the handling code was not updating the state
of the user whose settings changed, rather the current user.

Added hidden APIs in content observer to know which user changed
and now the print manager serivce handles content changes for the
correct user.

bug:16977006

Change-Id: I71ec88c8f3f38cb405844c13ab83695c2029eb79
 2014-08-26 18:19:13 -07:00
Christopher Tate
1871b9352e Merge "Briefly log wallpaper restore outcomes" into lmp-dev 2014-08-27 00:56:19 +00:00
Yorke Lee
5edb638eed Merge "API changes for ContactsContract" into lmp-dev 2014-08-27 00:51:07 +00:00
Yorke Lee
b31c8abdc4 API changes for ContactsContract 
* Hide NAME_VERIFIED
* Add PinnedPositions.pin

Bug: 17253963
Change-Id: I887fb291fa4de8db6859655956a80898d1ee618c
 2014-08-26 17:13:02 -07:00
Christopher Tate
8ab0865156 Briefly log wallpaper restore outcomes 
Bug 17112780

Change-Id: I3e9a23d28c9df4f708eb24b4688322c21a8c8382
 2014-08-26 17:08:04 -07:00
Jeff Hao
2583ced835 am c4ef03d0: am 73fb1feb: Merge "Add sample profiling option to am." into lmp-dev 
* commit 'c4ef03d0144ca92957724d142c9511bcc5603094':
  Add sample profiling option to am.
 2014-08-26 23:25:44 +00:00
Alan Viverette
e1b0e79362 am a83f3c86: am 2b013731: Merge "Use bounds in screen for better A11y backwards compatibility" into lmp-dev 
* commit 'a83f3c861444425092c60a3a51a9d25d05ab8ab8':
  Use bounds in screen for better A11y backwards compatibility
 2014-08-26 23:10:23 +00:00
Alan Viverette
b6b6bf7d06 am fd6bc26a: am 413e2c21: Merge "Make shadow alpha properties public, add lighting values for TV" into lmp-dev 
* commit 'fd6bc26a382599e3796e2fe15a30207bbff7e3de':
  Make shadow alpha properties public, add lighting values for TV
 2014-08-26 23:10:09 +00:00
Alan Viverette
7b5bf2f10b am 4c06e89b: am 4f17dc02: Merge "Update date and time picker styling" into lmp-dev 
* commit '4c06e89b3c661ebb3451ff64c293b823e8c655b7':
  Update date and time picker styling
 2014-08-26 23:10:02 +00:00
Jeff Hao
0dedb722e6 Merge "Add sample profiling option to am." into lmp-dev 2014-08-26 22:59:36 +00:00
Jeff Hao
1b012d302b Add sample profiling option to am. 
Also bundles all profiling options into a class.

Bug: 17040932
Change-Id: I85d675ee1494bdc7308caffdf94145d27c996e9d
 2014-08-26 15:54:25 -07:00
Alan Viverette
22d8a776cd Merge "Use bounds in screen for better A11y backwards compatibility" into lmp-dev 2014-08-26 22:52:47 +00:00
Alan Viverette
f3542fd63f Merge "Make shadow alpha properties public, add lighting values for TV" into lmp-dev 2014-08-26 22:52:32 +00:00
Alan Viverette
03740d74ca Merge "Update date and time picker styling" into lmp-dev 2014-08-26 22:51:50 +00:00
Jim Miller
7364f8d54e am ed18d240: am fc5346ed: Merge "Hide fingerprint API until new API is ready" into lmp-dev 
* commit 'ed18d240c9e565806beed2fc8701d3eb2c5cf8cd':
  Hide fingerprint API until new API is ready
 2014-08-26 22:23:12 +00:00
Jim Miller
e7b6b1aae7 Merge "Hide fingerprint API until new API is ready" into lmp-dev 2014-08-26 22:02:52 +00:00
Jeff Sharkey
971c5910e7 am 232aac5c: am 64c53500: Merge "Report FileBridge failures as wtf()." into lmp-dev 
* commit '232aac5cc0313a94ce3c96bd0f3a13e0b70c9a36':
  Report FileBridge failures as wtf().
 2014-08-26 22:01:00 +00:00
vandwalle
fb9cf903fb am 39b53f3c: am bdc65df3: Merge "remove passpoint - DO NOT MERGE" into lmp-dev 
* commit '39b53f3c10e1e758c2bcc27ffd9f4c1076d13539':
  remove passpoint - DO NOT MERGE
 2014-08-26 22:00:54 +00:00
Christoph Studer
b3196d3327 am deefd534: am 7e637d1e: Merge "NoListener: meetsInterruptionFilter -> matchesInterruptionFilter" into lmp-dev 
* commit 'deefd53448758914da3c943e0cff751fc5f783fc':
  NoListener: meetsInterruptionFilter -> matchesInterruptionFilter
 2014-08-26 22:00:25 +00:00
Christoph Studer
ad486ef172 am 48308602: am e25ac583: Merge "Notification: Optimize L icon processing" into lmp-dev 
* commit '483086029fe7556903e0b4131c6fedf9f8690fa5':
  Notification: Optimize L icon processing
 2014-08-26 22:00:14 +00:00
Alan Viverette
ed6f14a20c Make shadow alpha properties public, add lighting values for TV 
BUG: 17189722
BUG: 17221975
Change-Id: I4ed477b658fec96ce69fa278f67345dab6bacaa3
 2014-08-26 14:53:28 -07:00
Jeff Sharkey
7837dac462 Merge "Report FileBridge failures as wtf()." into lmp-dev 2014-08-26 21:27:11 +00:00
vandwalle
7aea15a08e Merge "remove passpoint - DO NOT MERGE" into lmp-dev 2014-08-26 21:26:42 +00:00
Jeff Sharkey
d3ca991700 Report FileBridge failures as wtf(). 
Bug: 17183379
Change-Id: Ifd4dc690c04439e1f7abebd8e0ca4e1ff97d9cc8
 2014-08-26 14:23:28 -07:00
Christoph Studer
faa9957fd3 Merge "NoListener: meetsInterruptionFilter -> matchesInterruptionFilter" into lmp-dev 2014-08-26 21:16:22 +00:00
Christoph Studer
6b6e9e05d3 Merge "Notification: Optimize L icon processing" into lmp-dev 2014-08-26 21:15:27 +00:00
Jeff Sharkey
5784e197a8 am f3f849d1: am 206f982b: Merge "Treat moving app as installing in new location." into lmp-dev 
* commit 'f3f849d1dffccf8f2e60e33f38085aae503bdd51':
  Treat moving app as installing in new location.
 2014-08-26 20:50:34 +00:00
Adam Lesinski
48978dc9ed am 90675431: am a707b2b8: Merge "Split up ComponentName in UsageEvents.Event" into lmp-dev 
* commit '9067543165d9c821ec8fba544fe50adc06350710':
  Split up ComponentName in UsageEvents.Event
 2014-08-26 20:29:39 +00:00
Paul Jensen
52baba9086 am dd46fb1f: am 96fff1a7: Merge "Implement VpnConfig.addAllowedApplication()." into lmp-dev 
* commit 'dd46fb1f205412681eb86f1ea5535088cd55b3e3':
  Implement VpnConfig.addAllowedApplication().
 2014-08-26 20:29:33 +00:00
Jeff Sharkey
264a5f5b34 Merge "Treat moving app as installing in new location." into lmp-dev 2014-08-26 20:29:13 +00:00
Dianne Hackborn
302da59d8b am f1bb15d2: am 55953caa: Merge "Fix issue #16311398: Limit number of documents a process can open" into lmp-dev 
* commit 'f1bb15d214bdb70e348ee7d649c1249a67434534':
  Fix issue #16311398: Limit number of documents a process can open
 2014-08-26 20:13:59 +00:00
Adam Lesinski
1dc0f36401 Merge "Split up ComponentName in UsageEvents.Event" into lmp-dev 2014-08-26 20:09:07 +00:00
Paul Jensen
5b62d263a7 Merge "Implement VpnConfig.addAllowedApplication()." into lmp-dev 2014-08-26 20:09:00 +00:00
Adam Lesinski
cf75b56e6c am 800225b1: am ef3e6d97: Merge "Add indexOf method to ArrayMap & ArraySet" into lmp-dev 
* commit '800225b1a61e7d41ead4b2c16cb4a2c9cd1f7525':
  Add indexOf method to ArrayMap & ArraySet
 2014-08-26 19:58:28 +00:00
Dianne Hackborn
4610545dd2 Merge "Fix issue #16311398: Limit number of documents a process can open" into lmp-dev 2014-08-26 19:56:26 +00:00
Adam Lesinski
9d9607527f Split up ComponentName in UsageEvents.Event 
Some events in the future may not have originated
from a class, so we shouldn't be using ComponentName.

Bug:17259858
Change-Id: Id7fe3245b91596cf27ae4ec51655602f01665622
 2014-08-26 12:41:31 -07:00
Adam Lesinski
27046c88bf Merge "Add indexOf method to ArrayMap & ArraySet" into lmp-dev 2014-08-26 19:38:04 +00:00
Calin Juravle
ca989888e2 am e956c7f0: am 2fb4f93e: Merge "Pass vmSafeMode (manifest attribute) to installd." into lmp-dev 
* commit 'e956c7f02cd51b577f46105620bb003059a2a87f':
  Pass vmSafeMode (manifest attribute) to installd.
 2014-08-26 19:32:57 +00:00
Selim Gurun
8290294af9 am 690378d1: am 961aaadf: Merge "Remove synchronized from acceptThirdPartyCookies()" into lmp-dev 
* commit '690378d1499052391b78d55c83a71c26c5d93062':
  Remove synchronized from acceptThirdPartyCookies()
 2014-08-26 19:32:52 +00:00
Svetoslav
366d513bc6 am aae7838d: am 0fbd3928: Merge "Fix accessiblity CTS tests (framework)." into lmp-dev 
* commit 'aae7838d105f3d67ef61a681f5cff1c2e3621f69':
  Fix accessiblity CTS tests (framework).
 2014-08-26 19:14:38 +00:00
Calin Juravle
d68f83cc47 Merge "Pass vmSafeMode (manifest attribute) to installd." into lmp-dev 2014-08-26 19:10:25 +00:00
Selim Gurun
790f6f449d Merge "Remove synchronized from acceptThirdPartyCookies()" into lmp-dev 2014-08-26 19:09:48 +00:00
Svetoslav
e39baa7307 Merge "Fix accessiblity CTS tests (framework)." into lmp-dev 2014-08-26 19:01:50 +00:00
Adam Lesinski
4e9c07c0de Add indexOf method to ArrayMap & ArraySet 
Getting the indexOf is useful for doing compound operations
like:

int i = set.indexOf(key);
if (i >= 0) {
    Object o = set.valueAt(i);
    o.blah();
    set.removeAt(i);
}

Change-Id: I3d4b77d1461ba969fc6b4d332d52d4d084b5b53c
 2014-08-26 11:53:32 -07:00
Adam Lesinski
448c076d33 am 806d4cfb: am 521edf85: Merge "Have R classes generate their own reference rewrite logic" into lmp-dev 
* commit '806d4cfb2a06a01be4a58ff25a55797d9140b917':
  Have R classes generate their own reference rewrite logic
 2014-08-26 18:42:24 +00:00