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

11708 Commits

Author SHA1 Message Date
Geoff Mendal
5b5c2ed862 Import translations. DO NOT MERGE 
Change-Id: I0f555d349f3a7dbaefbc3ffd49033c97bbb0a4d2
Auto-generated-cl: translation import
 2015-01-14 10:21:29 -08:00
Geoff Mendal
0ff04197d8 Import translations. DO NOT MERGE 
Change-Id: I9dbf0951156e77375b9d21b0461f56b440602341
Auto-generated-cl: translation import
 2015-01-12 10:50:24 -08:00
Etan Cohen
cd0555f273 am f428db20: am 16918817: Merge "Added configuration to determine whether VoLTE requires provisioning." into lmp-mr1-dev automerge: b4eb723 
* commit 'f428db20d0db356d8afb05a3a0d9aa23f27702a3':
  Added configuration to determine whether VoLTE requires provisioning.
 2015-01-11 19:29:00 +00:00
Etan Cohen
f428db20d0 am 16918817: Merge "Added configuration to determine whether VoLTE requires provisioning." into lmp-mr1-dev 
automerge: b4eb723

* commit 'b4eb72322fb26b08c781f051651ec5106725c80f':
  Added configuration to determine whether VoLTE requires provisioning.
 2015-01-11 19:21:34 +00:00
Etan Cohen
038c3d21a7 Added configuration to determine whether VoLTE requires provisioning. 
Bug: 18576107
Change-Id: I08c231a3d876f3fe92c0fcb7f52be878b2da00dd
 2015-01-10 04:26:22 +00:00
Robin Lee
faafecaa7d am e24637e6: am 7f7ea82c: Profile owner hint in warning for extra CAs automerge: 34f3ade 
* commit 'e24637e641ec1f39455f270a4d6050c4d0383515':
  Profile owner hint in warning for extra CAs
 2015-01-09 15:20:11 +00:00
Robin Lee
e24637e641 am 7f7ea82c: Profile owner hint in warning for extra CAs 
automerge: 34f3ade

* commit '34f3adedcc20b365361f40131347179152377954':
  Profile owner hint in warning for extra CAs
 2015-01-09 15:13:52 +00:00
Robin Lee
7f7ea82c28 Profile owner hint in warning for extra CAs 
The version of the warning with a named installer should be shown in
the case of a managed profile, not only a managed device.

Bug: 18224038
Change-Id: I27865f77e963b9b15416f2e4a4ffc38fed8f5532
 2015-01-09 11:25:04 +00:00
Alan Viverette
4e5168fae4 Update year picker to use activation colors 
Change-Id: I148b592538e1e4a928bd7ebb99a3083b760b839d
 2015-01-08 15:25:30 -08:00
Robin Lee
1ea47aa083 am a92da1c2: am 2cc617b2: Merge "Revert "Profile owner hint in warning for extra CAs"" into lmp-mr1-dev automerge: bc7efed 
* commit 'a92da1c21aba700519f51f690fad28e6ca4154a6':
  Revert "Profile owner hint in warning for extra CAs"
 2015-01-08 22:48:54 +00:00
Robin Lee
a92da1c21a am 2cc617b2: Merge "Revert "Profile owner hint in warning for extra CAs"" into lmp-mr1-dev 
automerge: bc7efed

* commit 'bc7efed6941ddc63b399818608a4ec117b74af5f':
  Revert "Profile owner hint in warning for extra CAs"
 2015-01-08 22:39:39 +00:00
Robin Lee
2cc617b2ad Merge "Revert "Profile owner hint in warning for extra CAs"" into lmp-mr1-dev 2015-01-08 22:31:36 +00:00
Robin Lee
e53b7dd066 Revert "Profile owner hint in warning for extra CAs" 
This reverts commit e1d8dcd9e170c1ed8a13b6e1256ea1fb22c26c49.

Something funny happened in the process of submitting this,
swathes of strings.xml became mis-encoded.

Bug: 18224038
Change-Id: I0276ff3f880fe749546e8cc7e3e2f41c22c27705
 2015-01-08 22:08:42 +00:00
Sanket Padawe
8b2a15ed39 am b3096a34: Merge "Removing DUN APN for Koodo CA (302-220)" into lmp-mr1-dev automerge: d3b6956 automerge: 720b3a0 
* commit 'b3096a344e739300d11d31207a2744b2b0870a08':
  Removing DUN APN for Koodo CA (302-220)
 2015-01-08 19:24:52 +00:00
Sanket Padawe
b3096a344e Merge "Removing DUN APN for Koodo CA (302-220)" into lmp-mr1-dev automerge: d3b6956 
automerge: 720b3a0

* commit '720b3a04a499d1ed516a37a8eadade9c8fb15f51':
  Removing DUN APN for Koodo CA (302-220)
 2015-01-08 19:16:29 +00:00
Sanket Padawe
d3b69567e3 Merge "Removing DUN APN for Koodo CA (302-220)" into lmp-mr1-dev 2015-01-08 19:08:08 +00:00
Sanket Padawe
cb2dc52aa6 Removing DUN APN for Koodo CA (302-220) 
Bug: 18813997
Change-Id: I7d129dfa0015d8a1d01e749dafcb7d95f837a5ec
 2015-01-08 11:05:43 -08:00
Alan Viverette
b97d69856d API for tinting TextView compound drawables 
BUG: 18762354
Change-Id: Iba6fab4f63a5d26cb27606d25a1fd0a1f47afa57
 2015-01-07 16:16:20 -08:00
Alan Viverette
ed26b9cfe8 Merge "Fix date picker color handling, expose StateSet utils in more places" 2015-01-07 23:26:19 +00:00
Alan Viverette
c5b95c20b6 Fix date picker color handling, expose StateSet utils in more places 
Enabled use of color selectors for the day number text, which lets us
use the "activated" text color and push the selection background
opacity up to 100%. Also ensures the selector circle stays within the
bounds of the selected day.

BUG: 18864682
Change-Id: Ia36ea748f83e13683a1de8ac1a259d353578d61a
 2015-01-07 13:57:12 -08:00
Geoff Mendal
5d2a778149 Import translations. DO NOT MERGE 
Change-Id: Ie481d48e65a34dfff6e669a0bd97a8e2ccd8801a
Auto-generated-cl: translation import
 2015-01-07 10:41:50 -08:00
Geoff Mendal
585a210ddb Import translations. DO NOT MERGE 
Change-Id: I41b418841fd7a2c436257ec29312411b1277b867
Auto-generated-cl: translation import
 2015-01-07 07:24:21 -08:00
Robin Lee
8e99586830 am 26e2da8f: am 374c358d: Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev 
automerge: 23bb3f1

* commit '23bb3f11cbe4ca64337b5b75c333ea891760213f':
  Profile owner hint in warning for extra CAs
 2015-01-07 12:43:41 +00:00
Robin Lee
23bb3f11cb am 26e2da8f: am 374c358d: Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev 
* commit '26e2da8ff8bdd577c915620c93805f21ff1fd65e':
  Profile owner hint in warning for extra CAs
 2015-01-07 12:41:44 +00:00
Robin Lee
374c358dd2 Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev 2015-01-07 12:30:57 +00:00
Alan Viverette
304ea5aac7 Merge "Allow use of theme attributes in color state lists" 2015-01-06 18:47:29 +00:00
Alan Viverette
107a4719d5 am a5478449: am ccfd34f6: Merge "Scroll handle was half as opaque as it was supposed to be" into lmp-mr1-dev 
automerge: 1c38711

* commit '1c38711bb45ea074b6456258079b18ba5c834ca6':
  Scroll handle was half as opaque as it was supposed to be
 2015-01-06 01:02:55 +00:00
Alan Viverette
1c38711bb4 am a5478449: am ccfd34f6: Merge "Scroll handle was half as opaque as it was supposed to be" into lmp-mr1-dev 
* commit 'a5478449679366fa48b27ff722160477aeca6dc0':
  Scroll handle was half as opaque as it was supposed to be
 2015-01-06 01:00:40 +00:00
Alan Viverette
ccfd34f6b5 Merge "Scroll handle was half as opaque as it was supposed to be" into lmp-mr1-dev 2015-01-06 00:49:09 +00:00
Alan Viverette
c01678ea2d Scroll handle was half as opaque as it was supposed to be 
BUG: 18903443
Change-Id: Ie6a220899685f654a40d57ae0408e9c91afe868a
 2015-01-05 16:06:26 -08:00
Dianne Hackborn
5f86b66c9b am 24bc8d76: am 29807195: Merge "Fix issue #18901214: APR: Frequent crash in android" into lmp-mr1-dev 
automerge: d17218e

* commit 'd17218e7df24da8a2bcf6e7714dc0151155c3286':
  Fix issue #18901214: APR: Frequent crash in android
 2015-01-05 23:16:42 +00:00
Dianne Hackborn
d17218e7df am 24bc8d76: am 29807195: Merge "Fix issue #18901214: APR: Frequent crash in android" into lmp-mr1-dev 
* commit '24bc8d761ae525f82dcaeee576ae238ab3a2de03':
  Fix issue #18901214: APR: Frequent crash in android
 2015-01-05 23:15:10 +00:00
Alan Viverette
45c4bbbbce Allow use of theme attributes in color state lists 
BUG: 17384842
Change-Id: Ibdc413acbd00e37b908432abd55f6521c22b8fc9
 2015-01-05 14:59:19 -08:00
Dianne Hackborn
b182955a1e Fix issue #18901214: APR: Frequent crash in android 
The ShutdownActivity was implemented in the system server
code, which is no longer part of the boot class path.  This would
work fine when requesting a shutdown from the primary user, since
in that case the activity would be loaded in to the main system
process which also has the system service code loaded.

However, when executed from a secondary user, we need to spin up
a new system process for it; that system process is just a regular
app process, without the system service code, so *boom*.

To fix this, move ShutdownActivity to the framework jar.

Change-Id: Icb831cd6ed619da5feede5605c45ef177a892fbc
 2015-01-05 14:40:24 -08:00
Robin Lee
e1d8dcd9e1 Profile owner hint in warning for extra CAs 
The version of the warning with a named installer should be shown in
the case of a managed profile, not only a managed device.

Bug: 18224038
Change-Id: I58bddb162799481d5e8feb169b0c0bff17cbeeb7
 2015-01-05 19:52:54 +00:00
Geoff Mendal
17f49b2965 Import translations. DO NOT MERGE 
Change-Id: I59e489f098cbcce382f65632f3002a293e33b315
Auto-generated-cl: translation import
 2015-01-05 10:44:48 -08:00
Baligh Uddin
6992a0da6d Import translations. DO NOT MERGE 
Change-Id: I0bb0474b2fb440480ae9eaef1266be341acc89f4
Auto-generated-cl: translation import
 2014-12-29 12:54:36 -08:00
Pavel Zhamaitsiak
22586f069a am b45075a7: Merge "Add configuration indicating whether TTY over VoLTE is supported." into lmp-mr1-dev automerge: 48fd168 
automerge: 73cce93

* commit '73cce93c07e871ad0fddf8a60a12e07660687d66':
  Add configuration indicating whether TTY over VoLTE is supported.
 2014-12-28 05:47:12 +00:00
Pavel Zhamaitsiak
73cce93c07 am b45075a7: Merge "Add configuration indicating whether TTY over VoLTE is supported." into lmp-mr1-dev 
automerge: 48fd168

* commit '48fd1688a27519b14959b1c181f1fa8178836997':
  Add configuration indicating whether TTY over VoLTE is supported.
 2014-12-28 05:32:24 +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
3d2f0f40d2 Import translations. DO NOT MERGE 
Change-Id: I0df2423ec6f0d689fb1b9510dcf3d13ba420f7cd
Auto-generated-cl: translation import
 2014-12-23 00:07:33 -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
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
Kris Giesing
0dd962db3e Merge "Fix minor spelling and grammar errors in public JavaDoc" 2014-12-19 23:56:44 +00:00
Sanket Padawe
c7fe97ef70 am 1e63f414: am 776164da: Merge "Removing unwanted tethering profiles from config.xml" into lmp-mr1-dev 
automerge: 8c3b102

* commit '8c3b1021ba5d18f791edf8e7d9199c60e6fe0746':
  Removing unwanted tethering profiles from config.xml
 2014-12-18 00:56:58 +00:00
Sanket Padawe
8c3b1021ba am 1e63f414: am 776164da: Merge "Removing unwanted tethering profiles from config.xml" into lmp-mr1-dev 
* commit '1e63f414ea7ecbe712e8b0dc493bb329f93e6031':
  Removing unwanted tethering profiles from config.xml
 2014-12-18 00:54:48 +00:00
Sanket Padawe
776164da3c Merge "Removing unwanted tethering profiles from config.xml" into lmp-mr1-dev 2014-12-18 00:44:08 +00:00
Alan Viverette
33e3cdab5b Allow theme attributes in <include> tag, fix <tag> context 
BUG: 17658979
Change-Id: I79a55ee53bff5ea6efb04997973a9aa810ff0950
 2014-12-17 15:43:29 -08:00
Sanket Padawe
d6d84bb856 Removing unwanted tethering profiles from config.xml 
Bug: 18769044
Change-Id: I9002f6bdcd23bf02596798bcb5370ed456aaca39
 2014-12-17 14:19:58 -08:00
Alan Viverette
acf874112a Merge "Revert "Allow theme attributes in <include> tag, fix <tag> context"" 2014-12-17 18:56:50 +00:00