Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
137,508 Commits 3 Branches 0 Tags
cf6527ca985ffcf904d63507bfe2780a35005262
Commit Graph

40243 Commits

Author SHA1 Message Date
Jinsuk Kim
cf6527ca98 Added missing entries in the cec device array 
Change-Id: Ibb775f47cb9fb53df0a1baf67d09d76c4cb42392
 2014-06-02 18:25:00 +09:00
Adam Powell
535499204b am 16b0baa4: Merge "Further implementation for ToolbarActionBar" into lmp-preview-dev 
* commit '16b0baa45bd68bb05863d3a6e92b7e8e0b452cb2':
  Further implementation for ToolbarActionBar
 2014-06-02 00:25:41 +00:00
Adam Powell
9558232a2e Merge "Further implementation for ToolbarActionBar" into lmp-preview-dev 2014-06-02 00:23:16 +00:00
Adam Powell
07a74548ae Further implementation for ToolbarActionBar 
Integrate activity options menu and inline Toolbars. Fix a series of
small associated bugs.

Activities now (privately) offer several menu-related events directly
to the associated ActionBar. In the future this should help us
untangle some of the menu-based pasta in PhoneWindow.

Bug 15344598

Change-Id: I76211ad17d2bcbb58cf1d88914e855416d084ded
 2014-06-01 17:15:42 -07:00
Alan Viverette
c65c7ae635 Merge commit '6682183b' into manualmerge 
Conflicts:
	core/res/res/values/public.xml

Change-Id: Ic91db6ee85dcd8a6b13716b600b04c78ceac4b33
 2014-06-01 16:44:28 -07:00
Alan Viverette
c3710eb20d Merge "Fixes hotspot list transitions, update to use a single hotspot" into lmp-preview-dev 2014-06-01 23:14:25 +00:00
Dongwon Kang
240b8368ce am 41e5f190: Merge "Add a path for generic event from a session to an application in Tv Input Framework." into lmp-preview-dev 
* commit '41e5f1907dc029ab5117b9f8bcbc69c7a0abaa11':
  Add a path for generic event from a session to an application in Tv Input Framework.
 2014-06-01 23:13:44 +00:00
Dongwon Kang
0bf8a21464 Merge "Add a path for generic event from a session to an application in Tv Input Framework." into lmp-preview-dev 2014-06-01 23:09:31 +00:00
Alan Viverette
4d2f2483f6 Fixes hotspot list transitions, update to use a single hotspot 
Also updates background and button colors to match spec, removes
dependency on bouncycastle Arrays. Vastly simplifies ripple drawing.
Adds APIs for maximum ripple radius. Makes selectableItemBackground
bounded by default and adds an unbounded version and theme attribute.

BUG: 15315168
BUG: 15314684
BUG: 15314830
BUG: 15316768
BUG: 15333033
BUG: 15344050
Change-Id: Ib0619587ce78e43056b66571bae185e0f1613185
 2014-06-01 15:58:04 -07:00
Adam Powell
1462ddcbd6 am 56ac0185: Change parameter name for Activity#setActionBar 
* commit '56ac018506f527ecd6b7a76adf824066371aa4fa':
  Change parameter name for Activity#setActionBar
 2014-06-01 20:36:05 +00:00
Adam Powell
377801463e Change parameter name for Activity#setActionBar 
Feedback from API review

Bug 14998253

Change-Id: Id3b87a8071d43de49847e93fd6229d48364bf55e
 2014-06-01 13:31:00 -07:00
John Spurlock
3a9b632ef2 am 74e2bdba: Settings: Keep SeekBarVolumizer in sync with audio stream. 
* commit '74e2bdbaa13d8519fb6e98aac016bcde62d50f73':
  Settings: Keep SeekBarVolumizer in sync with audio stream.
 2014-06-01 17:08:13 +00:00
John Spurlock
0dbf1a6be2 Settings: Keep SeekBarVolumizer in sync with audio stream. 
Use AudioManager.VOLUME_CHANGED_ACTION instead of relying
on obsolete settings.

Bug:15343543
Change-Id: Ia95237bb455268314ec985affe92b0cec6b52e29
 2014-06-01 13:01:23 -04:00
Amith Yamasani
f20d640fa2 Restrictions Manager 
Mechanism to register a provider for requesting an
administrator to respond to permission requests.

Request format and response format constants.

Description of manifest template for static restrictions.
Int type introduced in RestrictionEntry.

Needs more javadoc and better description of manifest templates,
including specifying the XML attributes.

Change-Id: I5a654d364e98379fc60f73db2e06bf9a8310263d
 2014-05-31 16:41:35 -07:00
Elliott Hughes
f8abeb8457 resolved conflicts for merge of 04c987a8 to master 
Change-Id: I27912e203e4d4e39aef6ffbb58b0934a2796ddfe
 2014-05-30 20:13:15 -07:00
Elliott Hughes
04c987a806 am 79067b3c: am 5568e0e4: Merge "Move frameworks/base off private libcore.ICU API." 
* commit '79067b3cb2f43e62b9a4d46082fb01cbcc513990':
  Move frameworks/base off private libcore.ICU API.
 2014-05-31 02:29:47 +00:00
Elliott Hughes
79067b3cb2 am 5568e0e4: Merge "Move frameworks/base off private libcore.ICU API." 
* commit '5568e0e45fff7ffe5061770cb527b22d09cf5519':
  Move frameworks/base off private libcore.ICU API.
 2014-05-31 02:26:36 +00:00
Elliott Hughes
5568e0e45f Merge "Move frameworks/base off private libcore.ICU API." 2014-05-31 02:22:24 +00:00
Elliott Hughes
570f44b4ab Move frameworks/base off private libcore.ICU API. 
Change-Id: I55355b7ea68174063f31d6bb08a71bcb9dc76d62
 2014-05-30 19:20:20 -07:00
Adam Powell
fb50dd580d am 8ce8cb05: Merge "Collapse contentInsets and View margins in Toolbars" into lmp-preview-dev 
* commit '8ce8cb05143964700d85067fc88ae914f382f0c4':
  Collapse contentInsets and View margins in Toolbars
 2014-05-31 02:00:36 +00:00
Jorim Jaggi
8cdef8293f am 698c8194: Merge "Fade scrim in unlock animation." into lmp-preview-dev 
* commit '698c81948ed277253d567aa4c34996d2d0477992':
  Fade scrim in unlock animation.
 2014-05-31 01:56:15 +00:00
Adam Powell
6a2d5e5b54 Merge "Collapse contentInsets and View margins in Toolbars" into lmp-preview-dev 2014-05-31 01:54:48 +00:00
Adam Powell
7a32401c2a Collapse contentInsets and View margins in Toolbars 
As content insets are meant to help line up the edges of views with
the content in adjacent ViewGroups, collapse individual view margins
with the insets to preserve this property. Margins still define a
minimum spacing between adjacent sibling views or the edges of the
Toolbar container.

Bug 15328526

Change-Id: I786ccdbed6b40930250fa22e2a6d0376d759f2d2
 2014-05-30 18:52:37 -07:00
Jorim Jaggi
d48d7a6d50 Merge "Fade scrim in unlock animation." into lmp-preview-dev 2014-05-31 01:09:19 +00:00
Jorim Jaggi
e29b2dbc76 Fade scrim in unlock animation. 
This also introduces a startTime which gets sent from window manager
to SystemUI, which tells when the animation should start, to allow
for a more synchronized animation with fading out the scrim and
fading in the activity behind.

Bug: 15163546
Change-Id: I16212b1ef9eb76f1f98734da1d14fc5b7e626937
 2014-05-31 02:48:06 +02:00
Dianne Hackborn
00fcdc1236 am d6f7d9b7: Merge "Clean up voice API." into lmp-preview-dev 
* commit 'd6f7d9b75931d031086a744cfd18994b2673f311':
  Clean up voice API.
 2014-05-31 00:00:05 +00:00
Dianne Hackborn
725010a83f Merge "Clean up voice API." into lmp-preview-dev 2014-05-30 23:54:11 +00:00
Jeff Sharkey
43e1565370 am 9a78d4de: Merge "Per-app media directories on external storage." into lmp-preview-dev 
* commit '9a78d4deb2d00dc67b2c11daf76b389e0712b535':
  Per-app media directories on external storage.
 2014-05-30 23:51:46 +00:00
Jeff Sharkey
05dc18d69a Merge "Per-app media directories on external storage." into lmp-preview-dev 2014-05-30 23:47:00 +00:00
Dianne Hackborn
a2c076d540 Clean up voice API. 
Add various java docs.

Switch to CharSequence where appropriate.

Add new request for canceling voice interaction.

Also update test app to follow API changes and be more better.

Change-Id: If27eeba53cf6444660adb7d37ea2ce0557c6c91f
 2014-05-30 16:42:57 -07:00
Jeff Sharkey
2ee3c1e189 Per-app media directories on external storage. 
This change defines per-app directories on external storage that
will be scanned and included in MediaStore.  This gives apps a way
to write content to secondary shared storage in a way that can
easily be surfaced to other apps.

Bug: 14382377
Change-Id: I4cb367c870509e76f0c2c598f01e2f699780030a
 2014-05-30 16:26:45 -07:00
Adam Powell
92bcf31f54 am 338382de: Merge "Fix action bar title TextAppearance usage for Toolbar decor" into lmp-preview-dev 
* commit '338382de18d9df699c15eb9adbaaa50d8a6664fd':
  Fix action bar title TextAppearance usage for Toolbar decor
 2014-05-30 23:25:23 +00:00
Adam Powell
ae706066e1 Merge "Fix action bar title TextAppearance usage for Toolbar decor" into lmp-preview-dev 2014-05-30 23:21:33 +00:00
Adam Powell
ebba5d4edd Fix action bar title TextAppearance usage for Toolbar decor 
Pass through the appropriate action bar styles for title/subtitle
TextAppearance.

Bug 15345937

Change-Id: I93c648cf60b4a63498d127dbd6eac2c1fae33aa7
 2014-05-30 16:19:16 -07:00
Yin-Chia Yeh
ee36492fac am 7ebaa1ef: Merge "Camera2: update the range of metering weight" into lmp-preview-dev 
* commit '7ebaa1ef18fd20500efb87f75e933b9e35fb5470':
  Camera2: update the range of metering weight
 2014-05-30 21:43:55 +00:00
Craig Mautner
9de076a0a1 am b01b028e: Merge "Change PersistableBundle API per council\'s request" into lmp-preview-dev 
* commit 'b01b028ed9a1a5b1a585152adf182afe16135c10':
  Change PersistableBundle API per council's request
 2014-05-30 21:43:49 +00:00
Yin-Chia Yeh
f41799e7f7 Merge "Camera2: update the range of metering weight" into lmp-preview-dev 2014-05-30 21:41:42 +00:00
Craig Mautner
9edc732477 Merge "Change PersistableBundle API per council's request" into lmp-preview-dev 2014-05-30 21:40:17 +00:00
Igor Murashkin
dbce83bf20 am 511b84d2: Merge "camera2: Change android.lens.focusRange to Pair<Float,Float>" into lmp-preview-dev 
* commit '511b84d26b3e4acfcee9ca2864588538b9801708':
  camera2: Change android.lens.focusRange to Pair<Float,Float>
 2014-05-30 21:39:30 +00:00
Chris Wren
9e427694a5 am 3d2f4c6b: Add people signals to Zen mode. 
* commit '3d2f4c6b1f3496de3b9c8ece1556684a6cb27903':
  Add people signals to Zen mode.
 2014-05-30 21:39:24 +00:00
Adam Powell
1994f41803 am d4a453ce: Merge "Compatibility fix for apps that construct Notification.Builders early" into lmp-preview-dev 
* commit 'd4a453ce132c926c136015e6799b0528656c9409':
  Compatibility fix for apps that construct Notification.Builders early
 2014-05-30 21:39:14 +00:00
John Reck
c6b6154ac1 am ea5af639: Merge "Re-jigger layers" into lmp-preview-dev 
* commit 'ea5af63965bf323580aa1e2854efb2f8cc3dc396':
  Re-jigger layers
 2014-05-30 21:39:04 +00:00
Wei Wang
75f5b3a8dd am 19bdd64c: Merge "Address API review comments. 1. Moved le stuff to it\'s subpackage. Remove BluetoothLe for all classes except *Scanner, *ScanSetting, *Advertiser and *AdvertiseSettings. 2. Make all callbacks abstract classes instead of interfaces. 3. Moved Advertis 
* commit '19bdd64c3b9dd16778575164c13c8af798832f01':
  Address API review comments. 1. Moved le stuff to it's subpackage. Remove BluetoothLe for all classes except *Scanner, *ScanSetting, *Advertiser and *AdvertiseSettings. 2. Make all callbacks abstract classes instead of interfaces. 3. Moved AdvertisementData and ScanRecord out and removed AdvertiseBaseData 4. Removed newBuild and use new Builder for all builders. 5. Using setxxx in builders. 6. Misc other changes.
 2014-05-30 21:38:59 +00:00
Santos Cordon
b69f1bddfe am 6d052adc: Merge "Update showCallScreen to use Telecomm (1/6)" into lmp-preview-dev 
* commit '6d052adc910bf2d2775881528cef3e41fe2cd14b':
  Update showCallScreen to use Telecomm (1/6)
 2014-05-30 21:38:54 +00:00
Dianne Hackborn
25ceaab596 am 3a967f83: Merge "Mark getRecentTasks() and getRunningTasks() as deprecated." into lmp-preview-dev 
* commit '3a967f8331a29ec1b5b8a44cda028417e0ef1e2c':
  Mark getRecentTasks() and getRunningTasks() as deprecated.
 2014-05-30 21:38:49 +00:00
Igor Murashkin
1998daf1ee Merge "camera2: Change android.lens.focusRange to Pair<Float,Float>" into lmp-preview-dev 2014-05-30 20:19:32 +00:00
Chris Wren
99f963ea04 Add people signals to Zen mode. 
Depends-On: I51fcf689ddbee7715e3387b865f18a715887c943
Change-Id: I7c91dec1afeb54505426c4da59ec4d072a60c240
 2014-05-30 16:16:23 -04:00
Craig Mautner
0a8e160eb5 Change PersistableBundle API per council's request 
Fixes bug 15192573.

Change-Id: Ib98ef132c8c12e68e805cb3c0b1f7ae75940f17c
 2014-05-30 13:14:44 -07:00
Adam Powell
2157b9dcef am a082f3a0: Merge "Fix bad casts in action bars" into lmp-preview-dev 
* commit 'a082f3a05ede6ae5fa4ab64b30a77de18579264c':
  Fix bad casts in action bars
 2014-05-30 20:08:35 +00:00
Adam Powell
da44532b61 Merge "Compatibility fix for apps that construct Notification.Builders early" into lmp-preview-dev 2014-05-30 20:01:54 +00:00