Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
157,433 Commits 3 Branches 0 Tags
a2d2aaabb26aa2c37d2153de12d645fbe367f239
Commit Graph

41447 Commits

Author SHA1 Message Date
Alan Viverette
a2d2aaabb2 am 4a8d9449: am 5f9ce5e9: am 515699a4: Merge "Use Calendar day of week rather than Time in SimpleMonthView" into lmp-dev 
* commit '4a8d944934b47cd3a0e9a52b5b133c550fe9c836':
  Use Calendar day of week rather than Time in SimpleMonthView
 2014-09-11 17:28:17 +00:00
Svetoslav Ganov
24b4c4e82c am 983a6f93: am b6e7e347: am f0ccea92: Merge "Using the correct package name for ContentResolver" into lmp-dev 
* commit '983a6f9385389e7d82ee4ea1d4343b949a67849d':
  Using the correct package name for ContentResolver
 2014-09-11 17:28:05 +00:00
Dianne Hackborn
3cec76c455 am 1fa1dd50: am f6f453d1: am b4ee4428: Merge "Fix issue #17428001: Fix revokeUriPermissions" into lmp-dev 
* commit '1fa1dd50bad987722c8907b1b305597884b7cc65':
  Fix issue #17428001: Fix revokeUriPermissions
 2014-09-11 17:27:48 +00:00
Lajos Molnar
5a52457fab am 7fca7f55: am b9414beb: am 3b22910c: Merge "add android.util.SizeF.parseSizeF()" into lmp-dev 
* commit '7fca7f55f21cd34b94ace89167f6516228520bff':
  add android.util.SizeF.parseSizeF()
 2014-09-11 17:27:43 +00:00
Alan Viverette
a75f6b3159 am b2f46415: am ba870607: am 78f863c7: Merge "Fix docs and nulling behavior for TextView.setCompoundDrawables" into lmp-dev 
* commit 'b2f46415d2a05e25a9eca912060958ac0d827c59':
  Fix docs and nulling behavior for TextView.setCompoundDrawables
 2014-09-11 17:26:57 +00:00
Alan Viverette
cfd3deef7d am 28d22bd2: am 1c19026d: am 8b5ef83e: Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev 
* commit '28d22bd23b219fc65eb80da04945fc0b72100040':
  Make SearchView styles public, remove public Holo styles added in L
 2014-09-11 17:26:40 +00:00
George Mount
10dcaa134f am b13022fd: am 86d1c5d3: am 0b46b913: Merge "Fix ArrayIndexOutOfBoundsException." into lmp-dev 
* commit 'b13022fd5fc168a70cd833dc355ee7ae05938891':
  Fix ArrayIndexOutOfBoundsException.
 2014-09-11 17:25:07 +00:00
Tao Bai
b1664bd741 am 42a3b372: am cdad4651: am 3350edac: Merge "Revise createIntent and parseResult API." into lmp-dev 
* commit '42a3b372b5c41f5fe9b3c4e8645a924e32dd0443':
  Revise createIntent and parseResult API.
 2014-09-11 17:24:48 +00:00
Craig Mautner
de1c660b36 am 242c891a: am 99a902ed: am cef60b6a: Merge "Wait for animation complete before completing boot" into lmp-dev 
* commit '242c891a8896977c90254a838b8f36fa165fdb6f':
  Wait for animation complete before completing boot
 2014-09-11 17:24:32 +00:00
George Mount
6381c728ae am 92eba9f0: am 7726c740: am b74b8d49: Merge "Move capturing entering views until just before transition." into lmp-dev 
* commit '92eba9f08abd508a849209c09328a3b1b3eb5c33':
  Move capturing entering views until just before transition.
 2014-09-11 17:24:04 +00:00
Chet Haase
1368cbb2e9 am 35dc5ec9: am 969628cd: am 804df9eb: Use constant state in AnimatedVectorDrawable 
* commit '35dc5ec9877b468cba32c60b729bfded559a5c5a':
  Use constant state in AnimatedVectorDrawable
 2014-09-11 17:24:00 +00:00
Raph Levien
cfbcca8992 am 75e39a46: am fff6aab7: am a31b4f03: Merge "Remove auto spaceifying behavior on paste" into lmp-dev 
* commit '75e39a46e1df35bfd3f77b4583b31ca24888651e':
  Remove auto spaceifying behavior on paste
 2014-09-11 17:23:07 +00:00
Jon Miranda
0b50acd03f am ea01c7d4: am a8ced922: am cfb0664e: Merge "Tries to resolve reference resource names instead of its data." into lmp-dev 
* commit 'ea01c7d4ff251d6702ca687b5bf83f7928a30aaa':
  Tries to resolve reference resource names instead of its data.
 2014-09-11 17:22:44 +00:00
Eino-Ville Talvala
c060183610 am 88720d12: am 6b63cd11: am 90229edc: Merge "Camera2: Allow captures right after abort" into lmp-dev 
* commit '88720d12694af351811572c3de80e9a1eae7c637':
  Camera2: Allow captures right after abort
 2014-09-11 17:22:02 +00:00
Robert Greenwalt
500c2e7c2c am efee3dea: am 5ad894d6: am eb843b14: Merge "Don\'t accept score below 0." into lmp-dev 
* commit 'efee3dea05d39d458519c259604394da91a7a722':
  Don't accept score below 0.
 2014-09-11 14:16:53 +00:00
Jeff Davidson
9441a44c6d am e966d4d8: am 426a5429: am cfd0e5c1: Merge "Update unclear Fragment Javadoc." into lmp-dev 
* commit 'e966d4d86c140b059158504e615042daa7d8e04f':
  Update unclear Fragment Javadoc.
 2014-09-11 14:15:50 +00:00
Ruben Brunk
09f0d12d3a am 2868a44d: am 7ac22597: am 17fcb255: Merge "camera2: Fix preview stretching in LEGACY mode." into lmp-dev 
* commit '2868a44d846345308fd0784ee3a31b280af66e9f':
  camera2: Fix preview stretching in LEGACY mode.
 2014-09-11 14:15:03 +00:00
Esteban Talavera
92f2cadf07 am bfb49179: am 52437ed7: am 55bffb50: Merge "Update string value for provisioning action and extra" into lmp-dev 
* commit 'bfb491793470f70cddcc7433a68f072a752aec41':
  Update string value for provisioning action and extra
 2014-09-11 14:14:34 +00:00
Jason Monk
b01080dcd2 am b92f1d78: am 6a747735: am 473d27fa: Merge "Move zen mode constants and code to framework" into lmp-dev 
* commit 'b92f1d7809da77cdef37d8ea2fff7a6beeb0094d':
  Move zen mode constants and code to framework
 2014-09-11 14:13:51 +00:00
John Spurlock
7377b57689 am cbd0cdc2: am 736196b2: am 82126845: Merge "Zen: make Condition available over @SystemApi" into lmp-dev 
* commit 'cbd0cdc297a140179b583c613591933d6fa8a643':
  Zen: make Condition available over @SystemApi
 2014-09-11 14:13:45 +00:00
George Mount
5aadc5e322 am 57980dca: am 568b3fe9: am 1fac2ba1: Merge "Use intrinsic size for path animation in AnimatedVectorDrawable" into lmp-dev 
* commit '57980dca613fee54e4993ea3cd12dd928b1fe007':
  Use intrinsic size for path animation in AnimatedVectorDrawable
 2014-09-11 14:13:37 +00:00
George Mount
9f874eaaaf am c58233b2: am 557b3f66: am bfbb5882: Merge "Fix fade transition not working with Activity Transitions." into lmp-dev 
* commit 'c58233b2a4c6f51eafd2be5544bbcf45faa9a7ec':
  Fix fade transition not working with Activity Transitions.
 2014-09-11 14:13:32 +00:00
John Spurlock
613d076fa5 am 56e64b2a: am 88c61af5: am 3a972844: Merge "Zen: Make condition providers available via @SystemApi." into lmp-dev 
* commit '56e64b2a589a09786caa1eb1d9bfa59292a227f2':
  Zen: Make condition providers available via @SystemApi.
 2014-09-11 14:13:24 +00:00
Adrian Roos
b6b356c07e am c52a9597: am 99006f6c: am be125380: Merge "Add system trust agents on first boot or when adding user" into lmp-dev 
* commit 'c52a95973ebacd5afcd6b2ae4937983726493d25':
  Add system trust agents on first boot or when adding user
 2014-09-11 14:12:53 +00:00
Kenny Guy
fa16ba6727 am 39a0254d: am a6e2ae35: am cefee0c8: Merge "Remember userId when stripping / rebuilding notification." into lmp-dev 
* commit '39a0254dbfdd170f85602db395a5144f9dd77870':
  Remember userId when stripping / rebuilding notification.
 2014-09-11 14:12:46 +00:00
Christoph Studer
cbbfdd93ce am 7e972136: am 72d1509d: am 6e68dff3: Merge "NoLiService: Delete @removed meetsInterruptionFilter" into lmp-dev 
* commit '7e97213689ca26aad243f5a5009c39f616298619':
  NoLiService: Delete @removed meetsInterruptionFilter
 2014-09-11 14:12:41 +00:00
Christoph Studer
2c17ed07ec am 10afc04f: am 27674421: am c4290acf: Merge "Notification: Use ViewStub for ProgressBar" into lmp-dev 
* commit '10afc04f80b3ae27f5d56f4f7a10ffd36366b432':
  Notification: Use ViewStub for ProgressBar
 2014-09-11 14:12:36 +00:00
Adam Connors
de2f85e871 am 94705219: am 50c161df: am 5e1fe70f: Merge "Add feature flags for verified boot and securely remove users." into lmp-dev 
* commit '94705219a13a9d8909c4502eac493d3ef9459403':
  Add feature flags for verified boot and securely remove users.
 2014-09-11 14:12:28 +00:00
Alan Viverette
bc57a08f5f am 5f9ce5e9: am 515699a4: Merge "Use Calendar day of week rather than Time in SimpleMonthView" into lmp-dev 
* commit '5f9ce5e98322d328e6b0628875f73aa688a71c9e':
  Use Calendar day of week rather than Time in SimpleMonthView
 2014-09-11 01:57:20 +00:00
Svetoslav Ganov
4165e500f6 am b6e7e347: am f0ccea92: Merge "Using the correct package name for ContentResolver" into lmp-dev 
* commit 'b6e7e347c15db664411aa6d369314ae396d4c65b':
  Using the correct package name for ContentResolver
 2014-09-11 01:57:14 +00:00
Alan Viverette
0c1964e76d Merge "Use Calendar day of week rather than Time in SimpleMonthView" into lmp-dev 2014-09-11 01:22:55 +00:00
Svetoslav Ganov
b1467faa23 Merge "Using the correct package name for ContentResolver" into lmp-dev 2014-09-11 01:21:21 +00:00
Dianne Hackborn
24d8c17bdb am f6f453d1: am b4ee4428: Merge "Fix issue #17428001: Fix revokeUriPermissions" into lmp-dev 
* commit 'f6f453d1baa77d3bed97936ffbe177d15055c8e8':
  Fix issue #17428001: Fix revokeUriPermissions
 2014-09-11 01:18:09 +00:00
Lajos Molnar
40449c70d6 am b9414beb: am 3b22910c: Merge "add android.util.SizeF.parseSizeF()" into lmp-dev 
* commit 'b9414beb66ef9ca14bc606256f3af781c8124901':
  add android.util.SizeF.parseSizeF()
 2014-09-11 01:18:01 +00:00
Dianne Hackborn
547f6e1803 Merge "Fix issue #17428001: Fix revokeUriPermissions" into lmp-dev 2014-09-11 00:55:25 +00:00
Lajos Molnar
5b54c9fb2a Merge "add android.util.SizeF.parseSizeF()" into lmp-dev 2014-09-11 00:55:06 +00:00
Alan Viverette
5878076456 Use Calendar day of week rather than Time in SimpleMonthView 
BUG: 17377360
Change-Id: I685f35b760c049edaa8934eccaf5ce1bbf326cf2
 2014-09-10 17:09:13 -07:00
Alan Viverette
86f062d98a am ba870607: am 78f863c7: Merge "Fix docs and nulling behavior for TextView.setCompoundDrawables" into lmp-dev 
* commit 'ba87060785fbb90ba7d0777a3938a1b95d3ee5a6':
  Fix docs and nulling behavior for TextView.setCompoundDrawables
 2014-09-10 23:51:39 +00:00
Alan Viverette
6b398e03c7 am 1c19026d: am 8b5ef83e: Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev 
* commit '1c19026dadb9d6013f48901aaf1e6451b42f0977':
  Make SearchView styles public, remove public Holo styles added in L
 2014-09-10 23:38:16 +00:00
Alan Viverette
593f2d33bb Merge "Fix docs and nulling behavior for TextView.setCompoundDrawables" into lmp-dev 2014-09-10 23:31:04 +00:00
Alan Viverette
7ff0270e7d Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev 2014-09-10 23:29:13 +00:00
Dianne Hackborn
192679a7d3 Fix issue #17428001: Fix revokeUriPermissions 
You can now revoke permissions that were granted to you.

Change-Id: I9a1872059edc715b10bbd2d653e45420d43331c3
 2014-09-10 16:20:24 -07:00
Alan Viverette
362f984df3 Make SearchView styles public, remove public Holo styles added in L 
We shouldn't adding styles for a deprecated theme. Also this cleans up
the removed public resources for easier deletion later.

BUG: 17455273
Change-Id: I2c5caf354aab91463702f25c38f0dd29c153ba44
 2014-09-10 16:05:35 -07:00
Xin Guan
2bcb97bfb5 Using the correct package name for ContentResolver 
Change-Id: I0518391f7262c78043fbd42ddfefef0f2451382c
 2014-09-10 15:19:16 -07:00
George Mount
11aa55502e am 86d1c5d3: am 0b46b913: Merge "Fix ArrayIndexOutOfBoundsException." into lmp-dev 
* commit '86d1c5d370576447d7c7c713bf0f258023a1c3d4':
  Fix ArrayIndexOutOfBoundsException.
 2014-09-10 21:55:20 +00:00
Tao Bai
96bca16a43 am cdad4651: am 3350edac: Merge "Revise createIntent and parseResult API." into lmp-dev 
* commit 'cdad4651a1e93b0cfe2b199e39e5583ce9a19454':
  Revise createIntent and parseResult API.
 2014-09-10 21:55:15 +00:00
Craig Mautner
c787572762 am 99a902ed: am cef60b6a: Merge "Wait for animation complete before completing boot" into lmp-dev 
* commit '99a902ed763df87484342899ebe33aa3744be420':
  Wait for animation complete before completing boot
 2014-09-10 21:55:05 +00:00
George Mount
05c4f7ad76 Merge "Fix ArrayIndexOutOfBoundsException." into lmp-dev 2014-09-10 21:47:58 +00:00
Tao Bai
bebc56209d Merge "Revise createIntent and parseResult API." into lmp-dev 2014-09-10 21:43:04 +00:00
George Mount
2e9616354c am 7726c740: am b74b8d49: Merge "Move capturing entering views until just before transition." into lmp-dev 
* commit '7726c7408402872e57c36bc23add1f387ff5eb71':
  Move capturing entering views until just before transition.
 2014-09-10 21:38:34 +00:00