drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
159,427 Commits 1 Branch 0 Tags
Commit Graph

159427 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Wright
446e019a06 Add MEDIA_PROJECTION_SERVICE to the ServiceName list. 
This prevents our lint tooling from complaining that we're passing
invalid values when trying to get the MediaProjectionManager.

Bug: 18830590
Change-Id: I34633248e895b0ac7f5083e18a7d2385ca6f8adb
 2014-12-23 17:01:49 -08:00
Marvin Paul
8fc5072524 Don't backup ringtone on non-telephony devices. 
Restoring a device that supports telephony using the backup set of
a non-telephony device would cause the ringtone to be set to "None"
instead of the default value. This was due to the fact that on
non-telephony devices, the ringtone value was being backed up as
"_silent" instead of null.

Bug: 18777629

Change-Id: Idece1f874438a895169dbba7df1d716adea6660e
 2014-12-23 14:58:17 -08:00
John Spurlock
af88a19165 Audio Policy: Clear calling identity for all paths setting ringer mode. 
For proper appops bookkeeping and zen setting changes.

Bug: 18832923
Change-Id: Ic029d3226458ca1a9229a0bc5726bedd5e117ad7
 2014-12-23 16:14:44 -05:00
Deepanshu Gupta
0ff4568ca0 Make Preference-cookie map non static. 
Moved the map from Preference to View Cookie to BridgeContext. This
means the map need not be static anymore.

NO_SQ: Depends on unsubmitted changes.
Change-Id: I662513def17bd6ec3a2646c3bec9bf4f9f89fc15
 2014-12-23 12:04:30 -08:00
Deepanshu Gupta
dfeffd4c0a Fix default initial value for preferences 
NO_SQ: Depends on unsubmitted changes.
Change-Id: I061cf71f6167d382e9ef060abeb4d5cff83c4104
 2014-12-23 12:04:30 -08:00
Deepanshu Gupta
10bb1371dc Add preferences rendering. 
NO_SQ: Depends on updating layoutlib-api-prebuilt.jar
Change-Id: Iae93ab74c478e6f2158e1528467bec9ee2d7ee9b
 2014-12-23 12:04:30 -08:00
Shishir Agrawal
7287ed3d4b Data quick settings - Usage shown should take into account merged IDs. 
The System Settings data usage graph takes into account merged Ids
(b/18012787), but the quick settings usage graph does not.

Bug: 18805245
Change-Id: I3146052606e691129a3aa5cc509cf632fda9d6b2
 2014-12-23 09:54:48 -08:00
Baligh Uddin
45c6ae56d9 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-23 15:53:44 +00:00
Baligh Uddin
155521586c Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-12-23 15:53:38 +00:00
Baligh Uddin
4acca67390 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-23 15:52:54 +00:00
Robin Lee
b4b14e391d Merge "Revert "DevicePolicy: Don't warn about managed profile CAs"" into lmp-mr1-dev 2014-12-23 12:30:28 +00:00
Baligh Uddin
3fa832bbfa Import translations. DO NOT MERGE 
Change-Id: I2096264002a0f4dad73672f5834327f151e95788
Auto-generated-cl: translation import
 2014-12-23 00:28:11 -08:00
Baligh Uddin
6bae3c9915 Import translations. DO NOT MERGE 
Change-Id: I0ae3a4265cb2b5b5a393cecd5f992736302f38b8
Auto-generated-cl: translation import
 2014-12-22 21:51:09 -08:00
Baligh Uddin
1cbf184edd Import translations. DO NOT MERGE 
Change-Id: Ic2b81358285cfa793cf31ddc621e86fadb7d218f
Auto-generated-cl: translation import
 2014-12-22 20:56:36 -08:00
Baligh Uddin
83a590b14c Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-23 04:44:58 +00:00
Baligh Uddin
4136b4f7fe Import translations. DO NOT MERGE 
Change-Id: Ib629c0bca4f92a0c81bf5af904773df1b1f8549e
Auto-generated-cl: translation import
 2014-12-22 20:23:07 -08:00
Pavel Zhamaitsiak
b45075a7cb Merge "Add configuration indicating whether TTY over VoLTE is supported." into lmp-mr1-dev 2014-12-23 03:39:07 +00:00
Sarah Maddox
7d9309b6e9 am 029acc8e: am ab515931: Merge "docs: Fixes typo on Play services page for Maps." into lmp-docs 
* commit '029acc8ee8e40933c62f19d6f7ced43dca10a6ff':
  docs: Fixes typo on Play services page for Maps.
 2014-12-23 03:07:35 +00:00
Sarah Maddox
029acc8ee8 am ab515931: Merge "docs: Fixes typo on Play services page for Maps." into lmp-docs 
* commit 'ab5159310ad68f4a4325d772dc7369f7368b5a5b':
  docs: Fixes typo on Play services page for Maps.
 2014-12-23 02:51:47 +00:00
Sarah Maddox
ab5159310a Merge "docs: Fixes typo on Play services page for Maps." into lmp-docs 2014-12-23 02:20:23 +00:00
Sarah Maddox
71de8ea11f docs: Fixes typo on Play services page for Maps. 
Bug: 18832605
Change-Id: I31cd802c80fe5f1c5b0c600859e9a32b020344e7
 2014-12-23 13:08:08 +11:00
Amit Mahajan
d00b6067bf Merge "IMS: add the api to get IMS registration information." into lmp-mr1-dev 2014-12-23 01:19:21 +00:00
Etan Cohen
0ee7485169 Add configuration indicating whether TTY over VoLTE is supported. 
Bug: 18593974
Change-Id: I8b45bfe91a7222d96f22a93e5bc887b96c231afe
 2014-12-22 22:50:42 +00:00
Jinsuk Kim
92ae5abf4d Merge "CEC: Let the caller check CEC device type" into lmp-mr1-dev 2014-12-22 22:48:45 +00:00
Jinsuk Kim
98d760e1c3 CEC: Let the caller check CEC device type 
Device event listener mechanism invoke the callback on all kinds
of devices in order to deal with a caller who wants to get notified
for all types. TIF was changed to check the device type to make
sure it handles source type only.

Bug: 18832462
Change-Id: I5123fe79c09f623849b93b64d0c28e6a930dd437
 2014-12-23 07:39:11 +09:00
Robert Greenwalt
4dcacef5c5 Merge "Fix timing between bcast and net setup." into lmp-mr1-dev 2014-12-22 22:32:41 +00:00
John Spurlock
17ca1aaf72 Merge "Zen: Fix selection logic for "Indefinitely"." into lmp-mr1-dev 2014-12-22 21:56:37 +00:00
John Spurlock
0b68850375 Zen: Fix selection logic for "Indefinitely". 
Use a signal condition value for the forever condition in the panel
to ease the distinction between no selection + selecting indef.

Bug: 18810529
Change-Id: I2590899ab43734708c72aad066653ef27f89d760
 2014-12-22 15:13:30 -05:00
Libin.Tang@motorola.com
0303be4a8a IMS: add the api to get IMS registration information. 
Bug: 18668325
Change-Id: Ie694c7f1cc12a573cbef2815199ae6c91cf8088e
 2014-12-22 19:35:18 +00:00
Jean-Michel Trivi
996af72b0c Merge "AudioRecord: filter attributes" into lmp-mr1-dev 2014-12-22 18:55:40 +00:00
Jean-Michel Trivi
43bcd8fa74 AudioRecord: filter attributes 
When creating an AudioRecord instance, filter the tags in the
  AudioAttributes to remove tags that are handled at the Java
  layer.

Bug: 18733215
Bug: 18736417

Change-Id: I16a3497742086deced4e8677bd6231290396c5f6
 2014-12-22 18:15:32 +00:00
Robin Lee
853964927c Revert "DevicePolicy: Don't warn about managed profile CAs" 
This reverts commit 80559f4aadb3419eecdf6bf61945af584cd2aa8a.

Bug: 18224038
Change-Id: I108a4e8cf185401fef4806e1ad8c2cc78992e843
 2014-12-22 13:22:11 +00:00
Joe Fernandez
69434df395 am 180bd6be: am 76db15a8: docs: fix problem with TOC after Japanese pages merge 
* commit '180bd6be5214a57283387cc3935e14742dc6f08b':
  docs: fix problem with TOC after Japanese pages merge
 2014-12-20 07:02:29 +00:00
Joe Fernandez
180bd6be52 am 76db15a8: docs: fix problem with TOC after Japanese pages merge 
* commit '76db15a8c9a644bdff854763a922e1e3fd525e9c':
  docs: fix problem with TOC after Japanese pages merge
 2014-12-20 06:49:19 +00:00
Joe Fernandez
76db15a8c9 docs: fix problem with TOC after Japanese pages merge 
Change-Id: I75c78bd600907467fa81af197df216d5e6a31b1f
 2014-12-19 22:38:47 -08:00
David Friedman
2d179c899a am 919ecb22: am 58a5e3db: Merge "Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e" into lmp-docs 
* commit '919ecb221f2132f4d907a2e37cf021e17538762d':
  Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e
 2014-12-20 03:05:16 +00:00
David Friedman
919ecb221f am 58a5e3db: Merge "Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e" into lmp-docs 
* commit '58a5e3db000c6fe42e68790e72418bf143e3bc14':
  Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e
 2014-12-20 02:48:00 +00:00
David Friedman
58a5e3db00 Merge "Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e" into lmp-docs 2014-12-20 02:04:39 +00:00
David Friedman
827cc88a33 Android TV initial (time-sensitive) localization release for Japanese partners. 
Bug: 18527238
Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e
 2014-12-19 18:00:44 -08:00
Joe Fernandez
214e6867c5 am c27d5fd6: am 7cec35ef: Merge "docs: b/18122848 [DAC] Android TV - Recommendation card" into lmp-docs 
* commit 'c27d5fd6a88b37226c02e67d6c86c75da47d5d9d':
  docs: b/18122848 [DAC] Android TV - Recommendation card
 2014-12-20 00:40:59 +00:00
Chet Haase
2167b11de6 Fix selector bug 
Issue #18784539 Row stays highlighted if I begin scrolling after the rows been highlighted in "About phone"

Change-Id: Ia91467d8fe64eec077f20af70eae0d5bb070c255
 2014-12-19 16:37:18 -08:00
Joe Fernandez
c27d5fd6a8 am 7cec35ef: Merge "docs: b/18122848 [DAC] Android TV - Recommendation card" into lmp-docs 
* commit '7cec35ef5225f3dbc11cd78b96478751fe4158c3':
  docs: b/18122848 [DAC] Android TV - Recommendation card
 2014-12-20 00:34:38 +00:00
Joe Fernandez
7cec35ef52 Merge "docs: b/18122848 [DAC] Android TV - Recommendation card" into lmp-docs 2014-12-20 00:30:09 +00:00
Joe Fernandez
001f6f5451 am 66fefd0c: am a9a36ab2: Merge "docs: plugin link name update" into lmp-docs 
* commit '66fefd0c4c91f29826be8c3e47f4ae2982468b19':
  docs: plugin link name update
 2014-12-20 00:23:30 +00:00
Scott Rowe
13d31b0a40 am d7d1411a: am e2b44f86: docs: Making TV Apps Searchable - new training 
* commit 'd7d1411aa04c834dfe65cb16e79c495a7d47dba0':
  docs: Making TV Apps Searchable - new training
 2014-12-20 00:23:25 +00:00
Joe Fernandez
66fefd0c4c am a9a36ab2: Merge "docs: plugin link name update" into lmp-docs 
* commit 'a9a36ab225f8e53d79d83ff9eb452efc4933b6ae':
  docs: plugin link name update
 2014-12-20 00:18:07 +00:00
Scott Rowe
d7d1411aa0 am e2b44f86: docs: Making TV Apps Searchable - new training 
* commit 'e2b44f86b9ff32cc5fec04c10d09d639fd1f45f2':
  docs: Making TV Apps Searchable - new training
 2014-12-20 00:18:03 +00:00
Joe Fernandez
a9a36ab225 Merge "docs: plugin link name update" into lmp-docs 2014-12-20 00:13:58 +00:00
Scott Rowe
ea7a71b25d docs: b/18122848 [DAC] Android TV - Recommendation card 
Change-Id: I3347254ae659e4edc7a07aa30b276bd24636db17
 2014-12-19 16:11:58 -08:00
Jinsuk Kim
2c8c47daef Merge "CEC: Allow no vendor-specific data for <Vendor Command With ID>" into lmp-mr1-dev 2014-12-19 23:58:12 +00:00