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

162242 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
eae390a94e Add DatePicker, CalendarView to LayoutLib tests 
Change-Id: Ice8c41ff90ccb0ffe90fcbfcccc91ea24225a3d9
 2015-01-02 11:20:19 -08:00
Jinsuk Kim
ad1e3d7df4 CEC: Buffer <Set System Audio Mode> 
<Set System Audio Mode> is another command that needs to be buffered
in case the command arrives before the system is ready to process it.
When processed, system audio mode will be enabled based on the
global setting.

Bug: 18809965

Change-Id: Ia6ebc4e2919e1b94498ca28f652c6db95f907f9c
 2015-01-02 16:08:56 +09:00
Deepanshu Gupta
f5b02eb7c4 resolved conflicts for a0bc2e7e to lmp-mr1-dev 
The original change wasn't properly merged into lmp-mr1-dev because of
merge conflicts. This change manually resolves the conflicts. The main
reason for the conflict was that TimePickerSpinnerDelegate was swapped
with TimePickerClockDelegate.

This change also fixes the typo in the original change which was fixed
in a subsequent change.

Original commit: 12b6d29b7b5592dcfb6e6fd6f0c21a40f37d014a
fix for typo: cb09bc45c58740af953874f9915306d351fc3d9d

Change-Id: I50bf8c2d86318f632465a38adfad16d1382a9319
 2014-12-30 14:07:29 -08:00
Michael Wright
9570045713 am a33424a5: Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceName list." into lmp-mr1-dev 
* commit 'a33424a540ea725d4b513ee713931c66e62721a2':
  Add MEDIA_PROJECTION_SERVICE to the ServiceName list.
 2014-12-30 19:45:47 +00:00
Michael Wright
a33424a540 Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceName list." into lmp-mr1-dev 2014-12-30 19:40:52 +00:00
Marvin Paul
8298afbc78 Merge "Don\'t backup ringtone on non-telephony devices." into lmp-mr1-dev 
automerge: a30fdf7

* commit 'a30fdf790d66e241252c51d7dbdc401e021e51ad':
  Don't backup ringtone on non-telephony devices.
 2014-12-30 00:53:52 +00:00
Marvin Paul
a30fdf790d Merge "Don't backup ringtone on non-telephony devices." into lmp-mr1-dev 2014-12-29 23:18:17 +00:00
Deepanshu Gupta
e64a5bd2fb Fix DatePicker rendering. 
1. Return AccessibilityManager service from context.
2. Don't throw an exception if no style specifited in
obtainStyledAttributes. Specifying no style is valid and it's supposed
to use the default theme in that case.

Bug: http://b.android.com/82712 and http://b.android.com/79218
Change-Id: Iba7097f36996e4d6f1e9db778dc73294f2854c79
 2014-12-29 12:29:16 -08:00
Andre Eisenbach
1d23da911a am d7d9cdae: Merge "Exclude unnecessary intents in SystemUI" into lmp-mr1-dev 
* commit 'd7d9cdaebb30df5564b5787ee02d4624673c8523':
  Exclude unnecessary intents in SystemUI
 2014-12-29 18:36:27 +00:00
Andre Eisenbach
d7d9cdaebb Merge "Exclude unnecessary intents in SystemUI" into lmp-mr1-dev 2014-12-29 18:32:22 +00:00
Svetoslav
72da9ed886 am e5ea48a7: Fix a race in accessibility manager. 
* commit 'e5ea48a7fe295a2815bab57f2e870901ce48b312':
  Fix a race in accessibility manager.
 2014-12-29 18:23:54 +00:00
Svetoslav
e5ea48a7fe Fix a race in accessibility manager. 
The accessibility manager has APIs for clients to observe changes
in accessibility, touch exploration, and high contrast states. The
notification of the listeners has to be done with no lock held but
in an attempt to do that the code was incorrectly iterating over
the copy on write collection.

bug:18840784

Change-Id: I6803ff1657fbf6b0cc7936671d5bbdebb5cbf6bb
 2014-12-29 09:40:46 -08:00
John Spurlock
db416907b8 am af84e073: Merge "Audio Policy: Clear calling identity for all paths setting ringer mode." into lmp-mr1-dev 
* commit 'af84e073bce12c6ae0c737339804e96314bb663d':
  Audio Policy: Clear calling identity for all paths setting ringer mode.
 2014-12-24 01:21:22 +00:00
John Spurlock
af84e073bc Merge "Audio Policy: Clear calling identity for all paths setting ringer mode." into lmp-mr1-dev 2014-12-24 01:16:14 +00:00
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
bedfb2faec am 45c6ae56: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '45c6ae56d969709e0969514fa219375561c2df38':
  Import translations. DO NOT MERGE
 2014-12-23 15:59:36 +00:00
Baligh Uddin
378939f058 am 4acca673: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '4acca673904d3f99a3686a9ad92f471e97e67959':
  Import translations. DO NOT MERGE
 2014-12-23 15:59:31 +00: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
c5d0323c12 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-23 15:53:32 +00:00
Baligh Uddin
4acca67390 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-23 15:52:54 +00:00
Baligh Uddin
b0e2d4c7f1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-23 15:52:49 +00:00
Robin Lee
c9db16c591 am b4b14e39: Merge "Revert "DevicePolicy: Don\'t warn about managed profile CAs"" into lmp-mr1-dev 
* commit 'b4b14e391dbcde537350ccf649b3603cafba1e6c':
  Revert "DevicePolicy: Don't warn about managed profile CAs"
 2014-12-23 13:29:05 +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
8dbf4f60e6 Import translations. DO NOT MERGE 
Change-Id: Ia6fc4bb7529db266834f9de0e809c77be53fa38b
Auto-generated-cl: translation import
 2014-12-23 00:37:22 -08: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
192c568072 Import translations. DO NOT MERGE 
Change-Id: I8e2bfc9d5db55c0a7aa2c0cc7d0318ed5df921c0
Auto-generated-cl: translation import
 2014-12-22 21:46:27 -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
cecabf48ae am 83a590b1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '83a590b14ca70da7b6061529a521212572d732b3':
  Import translations. DO NOT MERGE
 2014-12-23 04:50:07 +00:00
Baligh Uddin
83a590b14c Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-23 04:44:58 +00:00
Baligh Uddin
f17490f5c2 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-23 04:44:53 +00:00
Baligh Uddin
0b85506360 Import translations. DO NOT MERGE 
Change-Id: Ie975c5e8d1edb7afc679ce1d27bb7e09b81df571
Auto-generated-cl: translation import
 2014-12-22 20:26:50 -08: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
48fd1688a2 am b45075a7: Merge "Add configuration indicating whether TTY over VoLTE is supported." into lmp-mr1-dev 
* commit 'b45075a7cb508e63ff2d662affbc970202249ac2':
  Add configuration indicating whether TTY over VoLTE is supported.
 2014-12-23 03:44:34 +00: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
4f68c0c1d8 am d00b6067: Merge "IMS: add the api to get IMS registration information." into lmp-mr1-dev 
* commit 'd00b6067bf03b59143d98dba1343ced27306863c':
  IMS: add the api to get IMS registration information.
 2014-12-23 01:24:28 +00: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
Jinsuk Kim
266f2b047e am 92ae5abf: Merge "CEC: Let the caller check CEC device type" into lmp-mr1-dev 
* commit '92ae5abf4dac470c5c915ec4782d5af6f251d257':
  CEC: Let the caller check CEC device type
 2014-12-22 22:53:58 +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