Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
154,021 Commits 3 Branches 0 Tags
9cc4bda235ea9ef2271c11d5c0da72c1ffbdc478
Commit Graph

44054 Commits

Author SHA1 Message Date
Alan Viverette
9cc4bda235 am e9d79974: am 33f52f1e: am f104c2f9: Merge "Cancel the date picker dialog when BUTTON_NEGATIVE is clicked" into lmp-dev 
* commit 'e9d79974a26ffd49eea25eaf03627eecec914349':
  Cancel the date picker dialog when BUTTON_NEGATIVE is clicked
 2014-08-28 23:24:04 +00:00
Alan Viverette
0a838608c8 am 33f52f1e: am f104c2f9: Merge "Cancel the date picker dialog when BUTTON_NEGATIVE is clicked" into lmp-dev 
* commit '33f52f1e6fba8b0cdcdefaff9bc8199f4021c48a':
  Cancel the date picker dialog when BUTTON_NEGATIVE is clicked
 2014-08-28 23:11:33 +00:00
Alan Viverette
33d93c5be6 am 44cc7c8f: am 89dbc546: am dceb15b2: Merge "Update action bar item widths, overflow menu, button, and spinner styles" into lmp-dev 
* commit '44cc7c8f65ecf68b93f05df32b57028771e3fd3d':
  Update action bar item widths, overflow menu, button, and spinner styles
 2014-08-28 22:58:41 +00:00
Christopher Tate
3d9c6e4ae8 am 06ccf6f7: am a618e54a: am 2c85f54f: Merge "Correct misleading javadoc for BackupHelper" into lmp-dev 
* commit '06ccf6f7ff737239357133bda3fbc385707b43b0':
  Correct misleading javadoc for BackupHelper
 2014-08-28 22:58:31 +00:00
Alan Viverette
9adfa37cfe Merge "Cancel the date picker dialog when BUTTON_NEGATIVE is clicked" into lmp-dev 2014-08-28 22:39:27 +00:00
Alan Viverette
3d6fec1ac7 am 89dbc546: am dceb15b2: Merge "Update action bar item widths, overflow menu, button, and spinner styles" into lmp-dev 
* commit '89dbc546572ae9f5f18efe127df7eaf00e2c7787':
  Update action bar item widths, overflow menu, button, and spinner styles
 2014-08-28 22:38:45 +00:00
Christopher Tate
fd5d43d09d am a618e54a: am 2c85f54f: Merge "Correct misleading javadoc for BackupHelper" into lmp-dev 
* commit 'a618e54ac648fd9b161ee08cd102ae31a1de17f8':
  Correct misleading javadoc for BackupHelper
 2014-08-28 21:14:08 +00:00
Alan Viverette
b1b267114c Merge "Update action bar item widths, overflow menu, button, and spinner styles" into lmp-dev 2014-08-28 21:05:04 +00:00
Alan Viverette
f023c2530a Update action bar item widths, overflow menu, button, and spinner styles 
Manually modifies the overflow button hotspot bounds so that the ripple
appears to be centered on the overflow icon. Adds styleable and parsing
for list popup window offsets. Updates spinner text appearance to be
consistent with drop down item text appearance. Also updates horizontal
inner padding in buttons.

BUG: 17305079
BUG: 17304391
BUG: 17302567
Change-Id: Iafddfef290078de968894a3b443ba9f60f84c6d4
 2014-08-28 13:55:18 -07:00
Christopher Tate
a43e2409ad Merge "Correct misleading javadoc for BackupHelper" into lmp-dev 2014-08-28 20:53:36 +00:00
Julia Reynolds
5fd5d461d2 am e7472cec: am fa39108f: am d266bd44: Merge "Audio/Micrphone user restriction/multiuser updates." into lmp-dev 
* commit 'e7472cec1f01174c6dfdbbbd1287dcde56c1a21e':
  Audio/Micrphone user restriction/multiuser updates.
 2014-08-28 20:10:38 +00:00
Dianne Hackborn
d5b4d7a40a am 2575d022: am c297cc71: am f63aa97c: Merge "Fix issue #17289876: startActivityFromRecents appears to launch the wrong task" into lmp-dev 
* commit '2575d022baf42e0945750703ccc7e5adb65e2009':
  Fix issue #17289876: startActivityFromRecents appears to launch the wrong task
 2014-08-28 20:10:33 +00:00
Julia Reynolds
9130ae4501 am fa39108f: am d266bd44: Merge "Audio/Micrphone user restriction/multiuser updates." into lmp-dev 
* commit 'fa39108f4a59e96915d9efbddd2548d49611745d':
  Audio/Micrphone user restriction/multiuser updates.
 2014-08-28 20:01:16 +00:00
Dianne Hackborn
85facfc1b7 am c297cc71: am f63aa97c: Merge "Fix issue #17289876: startActivityFromRecents appears to launch the wrong task" into lmp-dev 
* commit 'c297cc71d1382b3a492087d64205ebe6f13b164a':
  Fix issue #17289876: startActivityFromRecents appears to launch the wrong task
 2014-08-28 20:01:12 +00:00
Winson Chung
dd014e73bf am 4eade477: am ef390cca: am 62354353: Merge "Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)" into lmp-dev 
* commit '4eade477fb2c2159afafe047e867007a986ad43c':
  Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)
 2014-08-28 19:51:08 +00:00
Julia Reynolds
a8528c6420 Merge "Audio/Micrphone user restriction/multiuser updates." into lmp-dev 2014-08-28 19:41:42 +00:00
Winson Chung
19042f10fa am ef390cca: am 62354353: Merge "Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)" into lmp-dev 
* commit 'ef390cca57352e4284827981d39d6cb600b2811d':
  Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)
 2014-08-28 19:38:45 +00:00
Dianne Hackborn
2db754ac6e Merge "Fix issue #17289876: startActivityFromRecents appears to launch the wrong task" into lmp-dev 2014-08-28 19:33:08 +00:00
Christoph Studer
23867c4303 am df5eb412: am a03d8335: am 6049c4b7: Merge "NoListener: Factor out ZEN mode API" into lmp-dev 
* commit 'df5eb41241872e641a199b7089894dac5c9c358c':
  NoListener: Factor out ZEN mode API
 2014-08-28 19:32:39 +00:00
Dianne Hackborn
102ecc0e11 am 73c10aa4: am 82f7dc78: am c6273338: Merge "Fix issue #16953886: History and batterystats checkin summary..." into lmp-dev 
* commit '73c10aa477896d0b46b223613e34781bb98589ff':
  Fix issue #16953886: History and batterystats checkin summary...
 2014-08-28 19:32:33 +00:00
Christoph Studer
2a7058d18d am a03d8335: am 6049c4b7: Merge "NoListener: Factor out ZEN mode API" into lmp-dev 
* commit 'a03d8335fea5e19e56e901e15213f0db16d570b6':
  NoListener: Factor out ZEN mode API
 2014-08-28 19:23:19 +00:00
Dianne Hackborn
93d0678e80 am 82f7dc78: am c6273338: Merge "Fix issue #16953886: History and batterystats checkin summary..." into lmp-dev 
* commit '82f7dc780dc2fb1c877fce19bea9a9e92b0a0bac':
  Fix issue #16953886: History and batterystats checkin summary...
 2014-08-28 19:23:14 +00:00
Winson Chung
8bd5d69008 Merge "Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)" into lmp-dev 2014-08-28 19:15:10 +00:00
Christoph Studer
45c0d5838f Merge "NoListener: Factor out ZEN mode API" into lmp-dev 2014-08-28 18:59:41 +00:00
Dianne Hackborn
7e7f9a3f7c Merge "Fix issue #16953886: History and batterystats checkin summary..." into lmp-dev 2014-08-28 18:58:16 +00:00
George Mount
297a940edb am bc231f74: am fc83d404: am 077805bf: Merge "Call SharedElementListener#setSharedElementEnd on back." into lmp-dev 
* commit 'bc231f74ffb488a5b559c9d5603819273ea30898':
  Call SharedElementListener#setSharedElementEnd on back.
 2014-08-28 18:43:24 +00:00
George Mount
fbc0a6b385 am d91a4566: am 7ffe01f2: am b0333ac9: Merge "Allow arbitrarily-added shared elements." into lmp-dev 
* commit 'd91a4566b14eecd672194a6cbce813ae9f5c6ecb':
  Allow arbitrarily-added shared elements.
 2014-08-28 18:43:19 +00:00
Dianne Hackborn
d7c9289f93 Fix issue #17289876: startActivityFromRecents appears to launch the wrong task 
It would be good to actually bring the task to the front.

Also, make the flow when inTask is provided better match what happens when
we go looking for a task on our own.

And this includes another fix that was supposed to be part of a different
change but I forgot this class is part of the framework project now.

Change-Id: I3cf05f2e585c0fd7a0dbb7c7cf9fb1655764dd93
 2014-08-28 11:38:13 -07:00
Nancy Chen
c39c6f06a8 am a13366b6: am 48add9d4: am 2ead90e0: Merge "Add field for sub_id in call log for sprout database." into lmp-dev 
* commit 'a13366b6279b047ad7bb4e0b2e8ef5e997e02b8a':
  Add field for sub_id in call log for sprout database.
 2014-08-28 18:30:39 +00:00
Jose Lima
b420cd132a am 639df5f0: am 0cdcdf5c: am 61c45885: Merge "Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()" into lmp-dev 
* commit '639df5f03738f244d1d1ef10f099e5784ee1b3e8':
  Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()
 2014-08-28 18:30:34 +00:00
George Mount
05951ddc63 am fc83d404: am 077805bf: Merge "Call SharedElementListener#setSharedElementEnd on back." into lmp-dev 
* commit 'fc83d40438a331a6f06da4b4cb27c85621ef3019':
  Call SharedElementListener#setSharedElementEnd on back.
 2014-08-28 18:27:48 +00:00
George Mount
bc1d08849a am 7ffe01f2: am b0333ac9: Merge "Allow arbitrarily-added shared elements." into lmp-dev 
* commit '7ffe01f2158212c6b9c46e23e3167e832fe53c5f':
  Allow arbitrarily-added shared elements.
 2014-08-28 18:27:43 +00:00
Alan Viverette
16a24bc435 Cancel the date picker dialog when BUTTON_NEGATIVE is clicked 
BUG: 17308290
Change-Id: I2cad1ece9eefc3c48e7574498ff9f79fe60c5f80
 2014-08-28 11:19:59 -07:00
Nancy Chen
389eda0398 am 48add9d4: am 2ead90e0: Merge "Add field for sub_id in call log for sprout database." into lmp-dev 
* commit '48add9d40e014cd585058358bbbb2e48fc10fe74':
  Add field for sub_id in call log for sprout database.
 2014-08-28 18:18:44 +00:00
Jose Lima
7fa75c1d58 am 0cdcdf5c: am 61c45885: Merge "Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()" into lmp-dev 
* commit '0cdcdf5cd1517760dcff30004a3e0f5686e68440':
  Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()
 2014-08-28 18:18:39 +00:00
Yigit Boyar
b304c42e11 am f7347ee4: am 9662e6de: am 129ca22e: Merge "Use a weak observable in AutoCompleteTextView" into lmp-dev 
* commit 'f7347ee497a07669a73968efecee3c6622258070':
  Use a weak observable in AutoCompleteTextView
 2014-08-28 18:08:27 +00:00
George Mount
de18420aff Merge "Call SharedElementListener#setSharedElementEnd on back." into lmp-dev 2014-08-28 18:05:40 +00:00
George Mount
01abcaa295 Merge "Allow arbitrarily-added shared elements." into lmp-dev 2014-08-28 18:02:27 +00:00
Nancy Chen
d1a5a46368 Merge "Add field for sub_id in call log for sprout database." into lmp-dev 2014-08-28 17:55:50 +00:00
Yigit Boyar
4286fa20f5 am 9662e6de: am 129ca22e: Merge "Use a weak observable in AutoCompleteTextView" into lmp-dev 
* commit '9662e6ded368d0eeaca0ca857be3c32eeb5f3f40':
  Use a weak observable in AutoCompleteTextView
 2014-08-28 17:51:58 +00:00
Jose Lima
d3458a9c34 Merge "Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()" into lmp-dev 2014-08-28 17:49:32 +00:00
Yigit Boyar
3e92d2ec47 Merge "Use a weak observable in AutoCompleteTextView" into lmp-dev 2014-08-28 17:33:36 +00:00
Christoph Studer
85a384b425 NoListener: Factor out ZEN mode API 
Bug: 17255109
Bug: 17295014
Change-Id: I7e1f6e29b8a23b8e59a8615a8012a86bd5dd22d7
 2014-08-28 19:28:12 +02:00
Winson Chung
48a10a56e9 Change API to return thumbnail size instead of individual dimensions. (Bug 17295512) 
- Fixing issue where we were pulling the thumbnail dimensions too early in AMS. (Bug 17286904)
- Simplifying the Recents code between start & configuration change

Change-Id: I6d667cbf37b844939e5fc466da613bb78ca05082
 2014-08-28 10:23:40 -07:00
Chet Haase
fb609eacf0 am d8646c8d: am b6c2cf70: am f223babb: Merge "Canceling ViewPropertyAnimator now removes pending actions" into lmp-dev 
* commit 'd8646c8d31e55ff4dd2fbf80f13a545c65925d72':
  Canceling ViewPropertyAnimator now removes pending actions
 2014-08-28 17:22:12 +00:00
Robert Greenwalt
6afc1ac0d7 am 65ce2f17: am 709b9740: am 97733309: Merge "Clean up Connectivity Logging." into lmp-dev 
* commit '65ce2f1703a9e150e08cf3424e5e88bb84cae81c':
  Clean up Connectivity Logging.
 2014-08-28 17:10:53 +00:00
Chet Haase
b198e5e475 am b6c2cf70: am f223babb: Merge "Canceling ViewPropertyAnimator now removes pending actions" into lmp-dev 
* commit 'b6c2cf70d0e4918093e1ca3d1056facbf196ac7c':
  Canceling ViewPropertyAnimator now removes pending actions
 2014-08-28 17:09:29 +00:00
Robert Greenwalt
c8ff9c4d9f am 709b9740: am 97733309: Merge "Clean up Connectivity Logging." into lmp-dev 
* commit '709b97402db136331f2a58c1a0b612b4f0fed365':
  Clean up Connectivity Logging.
 2014-08-28 16:54:42 +00:00
Jeff Sharkey
d380f5604f am bc55cead: am cb1236be: am 7cb28e7b: Merge "Define EXTRA_SIZE for ContentProviders." into lmp-dev 
* commit 'bc55cead16c51a846c3fc1c8afd2aaf3d02e0b25':
  Define EXTRA_SIZE for ContentProviders.
 2014-08-28 16:47:39 +00:00
Chet Haase
06c34e7cbe Merge "Canceling ViewPropertyAnimator now removes pending actions" into lmp-dev 2014-08-28 16:42:27 +00:00