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

7514 Commits

Author SHA1 Message Date
Baligh Uddin
55635416a4 Merge "Import translations. DO NOT MERGE" 2013-09-06 04:56:32 +00:00
Amith Yamasani
cd57b4950f am 3d27c9f9: am f1eebfc2: Merge "Remove unused APIs and rename others based on API review" into klp-dev 
* commit '3d27c9f973b1dd35ed457785b452851316cdca8a':
  Remove unused APIs and rename others based on API review
 2013-09-05 17:33:19 -07:00
Amith Yamasani
3d27c9f973 am f1eebfc2: Merge "Remove unused APIs and rename others based on API review" into klp-dev 
* commit 'f1eebfc2cf47b7fb6ed8dfd06fb124f78ca3519e':
  Remove unused APIs and rename others based on API review
 2013-09-05 15:51:34 -07:00
Amith Yamasani
f1eebfc2cf Merge "Remove unused APIs and rename others based on API review" into klp-dev 2013-09-05 22:48:17 +00:00
Amith Yamasani
d304af6989 Remove unused APIs and rename others based on API review 
Restrictions challenge is only to be used by device admins.

Bug: 10461761
Change-Id: I3db1249e2ce99f386602de59ed930302bb0a97fb
 2013-09-05 09:30:23 -07:00
Baligh Uddin
1b9ff2b0af Import translations. DO NOT MERGE 
Change-Id: I6ac69f4d7c3a10bf404c7969ac11b22ee9ec8c7a
Auto-generated-cl: translation import
 2013-09-05 09:02:11 -07:00
John Spurlock
2dd417de0f am 82dda7b0: am a6fdd7f2: Merge "SystemUI asset update." into klp-dev 
* commit '82dda7b0c666c5772c9b604d947793ea84f8fe7d':
  SystemUI asset update.
 2013-09-04 19:07:55 -07:00
John Spurlock
82dda7b0c6 am a6fdd7f2: Merge "SystemUI asset update." into klp-dev 
* commit 'a6fdd7f2eae0d30c36f0eb9f8eac53d3b64b6827':
  SystemUI asset update.
 2013-09-04 19:05:05 -07:00
John Spurlock
a6fdd7f2ea Merge "SystemUI asset update." into klp-dev 2013-09-05 02:02:53 +00:00
John Spurlock
7436f07eb5 SystemUI asset update. 
Plus a few framework resources used as status icons.

Bug:10502089
Change-Id: I66d3bcbb408a8e008cbb383cb3a1a55f97d3d64c
 2013-09-04 21:52:37 -04:00
Chet Haase
4918e7ad66 resolved conflicts for merge of 09ed0720 to master 
Change-Id: I1ce1b48a9fb954caf4fd15237f2f608ac9c478fe
 2013-09-04 17:19:44 -07:00
Chet Haase
09ed072028 am 49ee555f: Merge "Transition API changes from API council recommendations" into klp-dev 
* commit '49ee555f239c79871b661e5ff135061f26665e1c':
  Transition API changes from API council recommendations
 2013-09-04 16:49:39 -07:00
Chet Haase
d82c8ac4db Transition API changes from API council recommendations 
Issue #10460684 KLP API Review: android.view.transition and android.animation
Issue #10570740 Transitions: inflate transition targets from xml

Change-Id: I7a3f6d3aece2fcafc5efd555d033f79e86635c98
 2013-09-04 14:46:38 -07:00
Tom O'Neill
7275ecc509 am 70c2dd93: am 2cf8138b: Merge "Add LocationManager.MODE_CHANGED_ACTION broadcast" into klp-dev 
* commit '70c2dd932bd585ed578ea684db06f17c4e5d24d3':
  Add LocationManager.MODE_CHANGED_ACTION broadcast
 2013-09-04 07:21:16 -07:00
Tom O'Neill
70c2dd932b am 2cf8138b: Merge "Add LocationManager.MODE_CHANGED_ACTION broadcast" into klp-dev 
* commit '2cf8138b919e543032cebe7eeb5777acb3431aee':
  Add LocationManager.MODE_CHANGED_ACTION broadcast
 2013-09-04 07:19:05 -07:00
Tom O'Neill
2cf8138b91 Merge "Add LocationManager.MODE_CHANGED_ACTION broadcast" into klp-dev 2013-09-04 14:16:12 +00:00
John Spurlock
30331c97bb am a92623f7: am 20c9606f: Merge "Remove unused status bar icon stat_sys_secure." into klp-dev 
* commit 'a92623f7763ee31e14566cfbed727e722d4e5689':
  Remove unused status bar icon stat_sys_secure.
 2013-09-04 06:40:19 -07:00
John Spurlock
a92623f776 am 20c9606f: Merge "Remove unused status bar icon stat_sys_secure." into klp-dev 
* commit '20c9606f5770496ffef45dd3d02a9885d3bed6b6':
  Remove unused status bar icon stat_sys_secure.
 2013-09-04 06:36:07 -07:00
John Spurlock
20c9606f57 Merge "Remove unused status bar icon stat_sys_secure." into klp-dev 2013-09-04 13:32:18 +00:00
Adam Skory
d3effc3941 am 1b6d0891: am 11254ade: Merge "Add provideAssistData attr to public.xml" into klp-dev 
* commit '1b6d08916c88827839416afd2ac264d422c469e7':
  Add provideAssistData attr to public.xml
 2013-09-04 05:27:10 -07:00
Adam Skory
1b6d08916c am 11254ade: Merge "Add provideAssistData attr to public.xml" into klp-dev 
* commit '11254adec733956085567af38036ab0e1e0e300f':
  Add provideAssistData attr to public.xml
 2013-09-04 05:24:11 -07:00
Adam Skory
16731d4dc0 Add provideAssistData attr to public.xml 
http://ag/323631 added the provideAssistData
attribute to the Service manifest tag.

It did not, however, add that attribute to
public.xml - making it impossible to actually
build a service that defines said tag.

So, add it.

Now that the attribute is where it should be,
restore @link notation to ServiceInfo.java
without breaking the offline docs build
( see http://ag//340279 ).

Also, make some log warnings related to
providing assist data slightly more verbose.

Bug: 10573008
Change-Id: Ie2bcb411c182d69738a2fa4a74de3171b9b9c455
 2013-09-04 12:30:47 +01:00
Baligh Uddin
778aaf7adc Merge "Import translations. DO NOT MERGE" 2013-09-04 04:43:33 +00:00
Baligh Uddin
b414cbddb9 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-04 04:43:28 +00:00
Tom O'Neill
40a86c24d2 Add LocationManager.MODE_CHANGED_ACTION broadcast 
- Currently redundant with PROVIDERS_CHANGED_ACTION, but that may
change in the future

- Part of fix for b/10409275

Change-Id: I12daaf20e6546fd9e9dc71c599967fa0ad95e27f
 2013-09-03 18:07:10 -07:00
Geoffrey Borggaard
ae1010646d am 5ea93036: am 4cf435a0: Merge "UX improvements to the restrictions PIN" into klp-dev 
* commit '5ea9303651ae9c1412eef42b59fb427f177f842e':
  UX improvements to the restrictions PIN
 2013-09-03 17:45:21 -07:00
Geoffrey Borggaard
5ea9303651 am 4cf435a0: Merge "UX improvements to the restrictions PIN" into klp-dev 
* commit '4cf435a038be4731c06602785f7dab8bee0b55af':
  UX improvements to the restrictions PIN
 2013-09-03 17:43:47 -07:00
Geoffrey Borggaard
4cf435a038 Merge "UX improvements to the restrictions PIN" into klp-dev 2013-09-04 00:41:26 +00:00
Matthew Xie
b90908eb9e am 171f8be4: am 02a25a97: Merge "Block ble adv api based on resource config" into klp-dev 
* commit '171f8be41215c2d9662c2da29329e9c4040fc3e0':
  Block ble adv api based on resource config
 2013-09-03 15:43:24 -07:00
Matthew Xie
171f8be412 am 02a25a97: Merge "Block ble adv api based on resource config" into klp-dev 
* commit '02a25a97a24e06768159ddc2b680c253a2ce71c7':
  Block ble adv api based on resource config
 2013-09-03 15:40:14 -07:00
Matthew Xie
02a25a97a2 Merge "Block ble adv api based on resource config" into klp-dev 2013-09-03 22:36:09 +00:00
Tom O'Neill
bac809db91 am 24bd1740: am d0e2a2e7: Merge "Improve constant names for settings injection API" into klp-dev 
* commit '24bd1740df0bec25c4a9262e8c578bfb765c3ef6':
  Improve constant names for settings injection API
 2013-09-03 13:30:59 -07:00
Tom O'Neill
24bd1740df am d0e2a2e7: Merge "Improve constant names for settings injection API" into klp-dev 
* commit 'd0e2a2e7a9a6c247f501a5044d1c19cd82c6129d':
  Improve constant names for settings injection API
 2013-09-03 13:28:24 -07:00
Tom O'Neill
d0e2a2e7a9 Merge "Improve constant names for settings injection API" into klp-dev 2013-09-03 20:25:56 +00:00
Martijn Coenen
dca11c9913 am e22cb840: am b143c669: Merge "Add drawable for Apdu Services, fix build." into klp-dev 
* commit 'e22cb840d5691c073d24cfa56c0df7f706fa4405':
  Add drawable for Apdu Services, fix build.
 2013-09-03 12:35:13 -07:00
Martijn Coenen
e22cb840d5 am b143c669: Merge "Add drawable for Apdu Services, fix build." into klp-dev 
* commit 'b143c66987d596d9101a5b12fcd7572d4a6026fb':
  Add drawable for Apdu Services, fix build.
 2013-09-03 12:32:07 -07:00
Martijn Coenen
c85fb576b8 Add drawable for Apdu Services, fix build. 
Change-Id: I7c138adb60b2efe19377b58b35360cd234628424
 2013-09-03 12:24:18 -07:00
Santos Cordon
92774a9f97 am 8bd2eb31: am 90a5df1e: Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev 
* commit '8bd2eb314bf923f556fda0229a1ef44392c4ec00':
  Revert "Add permissions for the InCallUI Split."
 2013-09-03 10:53:28 -07:00
Santos Cordon
8bd2eb314b am 90a5df1e: Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev 
* commit '90a5df1ee8c89ca17df93d9ecf95652b2ae619f4':
  Revert "Add permissions for the InCallUI Split."
 2013-09-03 10:49:15 -07:00
Santos Cordon
90a5df1ee8 Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev 2013-09-03 17:43:29 +00:00
Santos Cordon
b6c46d2381 Revert "Add permissions for the InCallUI Split." 
This reverts commit bf84eb5ed579d13b74c97b995299ca61cafedea6.

Change-Id: I40e311174898a741f5053501290833420355ad03
 2013-09-03 17:42:04 +00:00
Baligh Uddin
369606b20c Import translations. DO NOT MERGE 
Change-Id: Ie85b893759882da0ce3161a377bd9768c7901ab3
Auto-generated-cl: translation import
 2013-09-03 09:57:33 -07:00
Santos Cordon
42d1cd25be am 8fab063a: am 7f60dc57: Merge "Add permissions for the InCallUI Split." into klp-dev 
* commit '8fab063abcfef648bef9232dad62c8b8cea251d5':
  Add permissions for the InCallUI Split.
 2013-09-03 09:50:09 -07:00
Santos Cordon
8fab063abc am 7f60dc57: Merge "Add permissions for the InCallUI Split." into klp-dev 
* commit '7f60dc57780281030f26a2109a64d0260e976af7':
  Add permissions for the InCallUI Split.
 2013-09-03 09:47:12 -07:00
Santos Cordon
7f60dc5778 Merge "Add permissions for the InCallUI Split." into klp-dev 2013-09-03 16:45:24 +00:00
Baligh Uddin
979a602c74 Import translations. DO NOT MERGE 
Change-Id: Icd9730e462bcfce224e9ddf43bb8ffa3c6cbf905
Auto-generated-cl: translation import
 2013-09-03 09:21:32 -07:00
John Spurlock
1f0c596563 Remove unused status bar icon stat_sys_secure. 
It was moved behind an undocumented setting three yrs ago.

Bug:10502089
Change-Id: Icef0e3deaa9b09afab98bbb76520b47a16da2069
 2013-09-03 12:04:38 -04:00
Santos Cordon
bf84eb5ed5 Add permissions for the InCallUI Split. 
Change-Id: Ic759d14acefcea746e0d8e86c0f006d4bc462386
 2013-09-03 08:19:17 -07:00
satok
31d3f51f48 am 35826992: am f2724463: Merge "Improve the API document for supportsSwitchingToNextInputMethod" into klp-dev 
* commit '3582699241554f28e9efd22b551837de22b6dd70':
  Improve the API document for supportsSwitchingToNextInputMethod
 2013-09-01 22:55:35 -07:00
satok
3582699241 am f2724463: Merge "Improve the API document for supportsSwitchingToNextInputMethod" into klp-dev 
* commit 'f272446372b865e315240bce50853769d77fa939':
  Improve the API document for supportsSwitchingToNextInputMethod
 2013-09-01 22:52:59 -07:00