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

7928 Commits

Author SHA1 Message Date
Jeff Sharkey
e0a0d0a911 am c620ec36: am 3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev 
* commit 'c620ec3614c8737b87d60efa9db96c288bcad794':
  Lock down MANAGE_DOCUMENTS permission.
 2014-03-21 17:57:01 +00:00
Jeff Sharkey
c620ec3614 am 3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev 
* commit '3f5232220f2db839f690489ed272113f660daa40':
  Lock down MANAGE_DOCUMENTS permission.
 2014-03-21 17:50:39 +00:00
Jeff Sharkey
3f5232220f Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev 2014-03-21 17:47:00 +00:00
Adam Powell
b035cfd3f4 am a6454ccb: am 49325305: Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev 
* commit 'a6454ccbfb5b1f39047f8bac74ec11093469cce2':
  Update contextual asset bar assets to avoid 9-patch artifacts
 2014-03-21 00:27:25 +00:00
Adam Powell
a6454ccbfb am 49325305: Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev 
* commit '49325305905198b9d077ccc784be96e5684e3623':
  Update contextual asset bar assets to avoid 9-patch artifacts
 2014-03-21 00:22:38 +00:00
Adam Powell
4932530590 Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev 2014-03-21 00:19:12 +00:00
Vinit Deshapnde
ec253bb376 am f92b0072: am 52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev 
* commit 'f92b00722d84fa0caea25a3363242b6dced0635c':
  DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns
 2014-03-20 19:36:22 +00:00
Vinit Deshapnde
f92b00722d am 52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev 
* commit '52bc363cf3a7de8431cfbb370f0fd3adeecaed52':
  DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns
 2014-03-20 19:31:42 +00:00
Vinit Deshapnde
52bc363cf3 Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev 2014-03-20 19:26:44 +00:00
Adam Powell
f503a2d47f Update contextual asset bar assets to avoid 9-patch artifacts 
Asset drop from UX

Bug 11879853

Change-Id: I8190340900a16ae41135ec1231e36e959603e165
 2014-03-20 09:32:11 -07:00
Vinit Deshapnde
45b97c2c99 DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns 
This helps in reducing overt scans when cell network is unavailable; and
in turn helps alleviate some regulatory concerns.

BUG: 11062898

Change-Id: I2d860f2d1acfdafba427504247a54b81482b0f5b
 2014-03-19 15:04:49 -07:00
Baligh Uddin
7cf3e334be Import translations. DO NOT MERGE 
Change-Id: I2a993d03ba28b42348c201919c4d1ab6bae23445
Auto-generated-cl: translation import
 2014-03-19 09:48:18 -07:00
Jeff Brown
b73417fc10 am c9a7eeba: am 4cb1bc28: Merge "Refresh cast icon assets to improve visual contrast." into klp-dev 
* commit 'c9a7eeba15641da5a5bc8499e813e6c2211506ff':
  Refresh cast icon assets to improve visual contrast.
 2014-03-19 00:31:06 +00:00
Jeff Brown
c9a7eeba15 am 4cb1bc28: Merge "Refresh cast icon assets to improve visual contrast." into klp-dev 
* commit '4cb1bc2877f8562e6d349a6c737a3055ef4eaa29':
  Refresh cast icon assets to improve visual contrast.
 2014-03-19 00:25:41 +00:00
Jeff Brown
f1e8d36327 Refresh cast icon assets to improve visual contrast. 
Bug: 13473719
Change-Id: Ia82b2bc487a612f24bbe47f7d6e9182e862bcefa
 2014-03-18 14:40:43 -07:00
Jeff Sharkey
42c32c0c88 Lock down MANAGE_DOCUMENTS permission. 
MANAGE_DOCUMENTS is a very broad permission, since it allows full
access to all DocumentsProviders.  DocumentsUI should really be the
only app holding this permission; everyone else should rely on Uri
permission grants for access.

Bug: 12958298
Change-Id: I1def48a4ea1814e031fc8513c3cd051d764cd7f8
 2014-03-18 11:05:43 -07:00
Geoff Mendal
6532523652 Import translations. DO NOT MERGE 
Change-Id: I0b2d6484e67628d26f34d3be39b8b11f009151bd
Auto-generated-cl: translation import
 2014-03-17 09:34:19 -07:00
Adam Powell
b61d39957b am 898d6d96: am 7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev 
* commit '898d6d964cb3b650b5c9bed2276310547e5455e0':
  Add a config override for ViewConfiguration#hasPermanentMenuKey
 2014-03-14 00:40:11 +00:00
Baligh Uddin
af7dcaadec Import translations. DO NOT MERGE 
Change-Id: I2b0385f74777c70bda7e2962777c1c96767bd222
Auto-generated-cl: translation import
 2014-03-12 09:09:05 -07:00
Adam Powell
898d6d964c am 7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev 
* commit '7f2c9e9420252a493b7399639f794c8a963444e5':
  Add a config override for ViewConfiguration#hasPermanentMenuKey
 2014-03-11 23:26:38 +00:00
Adam Powell
7f2c9e9420 Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev 2014-03-11 23:19:37 +00:00
Adam Powell
15b13a792c Add a config override for ViewConfiguration#hasPermanentMenuKey 
Allow device overlays to override the behavior of the
hasPermanentMenuKey method at build time. This is useful for devices
that do not behave as the usual autodetection mechanism expects.

Device overlays should set config_overrideHasPermanentMenuKey to 1 if
the device DOES have a permanent menu key or 2 if the device DOES NOT
have a permanent menu key.

Bug 11698700

Change-Id: I467b68528cf681b08adcaebc2402d8bdd84f6b5c
 2014-03-11 21:20:13 +00:00
Baligh Uddin
fafc1ce9f8 Import translations. DO NOT MERGE 
Change-Id: Iee9ef4f534076df84a28d70663293dc42b26cb99
Auto-generated-cl: translation import
 2014-03-10 12:36:47 -07:00
Vineeta Srivastava
f066adde7a am dbeb0c12: Merge "telephony: Add same named operator configuration for some operators" into klp-dev 
* commit 'dbeb0c12950e92a59671f8da7952ddf3486789b4':
  telephony: Add same named operator configuration for some operators
 2014-03-07 21:12:17 +00:00
Vineeta Srivastava
dbeb0c1295 Merge "telephony: Add same named operator configuration for some operators" into klp-dev 2014-03-07 20:09:00 +00:00
Sungmin Choi
5d37e0d1b4 telephony: Add same named operator configuration for some operators 
Add same named operator configuration for 404, 405, and 520.
That is, show roaming icon though same named operators.

Bug: 12121959
Change-Id: I9148bab727170f670fd2679db69b123b0526bb32
 2014-03-07 11:29:18 -08:00
Vineeta Srivastava
3d924f1e8d am ef86ff58: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev 
* commit 'ef86ff58178e876f1dfbedd65166cc806f006ba8':
  Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]
 2014-03-07 18:40:53 +00:00
Vineeta Srivastava
ef86ff5817 Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev 2014-03-07 18:37:42 +00:00
Sungmin Choi
22ec0dc353 Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE] 
This reverts commit 119e24f98706cb0a1217b41e7e750b94c1a8941a.

Bug: 12163013
Change-Id: I574d1492253eb6e1f570411e441c5bea7376112c
 2014-03-07 18:37:26 +00:00
Wink Saville
4ee594e305 am 16c0b295: am bba3a694: Merge "Telephony API extension v2" 
* commit '16c0b295ef069e128a4e01fd2f72da06784950a1':
  Telephony API extension v2
 2014-03-07 02:30:08 +00:00
Dianne Hackborn
c1349a9601 am 4ad93639: am 67754d93: Merge "Runtime resource overlay, iteration 2" 
* commit '4ad93639d210297764db3ffcd870ff38464943de':
  Runtime resource overlay, iteration 2
 2014-03-07 02:27:10 +00:00
Santos Cordon
ff96593ede am abbd963e: am 4c8c27ed: Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE. 
* commit 'abbd963e3c50f5241f9bf668b8b806c42a202621':
  Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
 2014-03-06 20:05:23 +00:00
Santos Cordon
abbd963e3c am 4c8c27ed: Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE. 
* commit '4c8c27ed7360abe3cd91a281e40d4e21948abc2a':
  Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
 2014-03-06 19:49:46 +00:00
Santos Cordon
4c8c27ed73 Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE. 
bug: 12175514

Change-Id: I37dba7eedbf86c0b87ce559a52fe0b15c6911bfa
(cherry picked from commit b4aeac730503eb4b9db7d2dcece48e1ca13b4b30)
 2014-03-06 17:27:59 +00:00
Baligh Uddin
221849b6d6 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-03-06 17:00:46 +00:00
Santos Cordon
77a60f006f Merge "Update permission description string." into klp-dev 2014-03-06 01:54:20 +00:00
Michael Wright
e4a7179278 am 4448f9d7: am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev 
* commit '4448f9d7ade3d08a29b1a191e182a403c5584388':
  Revert Japanese special case fallback keys.
 2014-03-06 00:56:59 +00:00
Michael Wright
4448f9d7ad am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev 
* commit 'c5dea68e9856698953dafca868eaee7207614641':
  Revert Japanese special case fallback keys.
 2014-03-06 00:53:22 +00:00
Michael Wright
c5dea68e98 Merge "Revert Japanese special case fallback keys." into klp-dev 2014-03-06 00:50:15 +00:00
Dirk Dougherty
f55616cd8b Update permission description string. 
Change-Id: I6cd5895d78bff4f6f3fc8090e13a9ddbd83a1978
(cherry picked from commit 08d7c2861fee205a314c3847ab5f5894617a233b)
 2014-03-05 23:21:41 +00:00
Baligh Uddin
8c0dff620a Import translations. DO NOT MERGE 
Change-Id: I04b3a1aaa779644d884edf77fd94dc8dccd1e36b
Auto-generated-cl: translation import
 2014-03-05 09:58:27 -08:00
Yorke Lee
6c758e8650 am 468e973f: am 81479358: Reword the "Quick contacts not available" string 
* commit '468e973f52d09a5e724c9ccb545ec08c49991506':
  Reword the "Quick contacts not available" string
 2014-03-04 04:12:06 +00:00
Yorke Lee
468e973f52 am 81479358: Reword the "Quick contacts not available" string 
* commit '81479358decb0a2cefbb8245e0f56ed0e966d697':
  Reword the "Quick contacts not available" string
 2014-03-04 04:09:04 +00:00
Yorke Lee
81479358de Reword the "Quick contacts not available" string 
Bug: 12077052
Change-Id: I6006692ae13d79d3697242d0b9015b30b1826eab
(cherry picked from commit 89b366fa95f625275f1b94d800d22998f942ab8c)
 2014-03-04 02:50:21 +00:00
Dirk Dougherty
95cf532fe3 am 26de0b71: am cce121fb: Merge "Update permission description string." into klp-docs 
* commit '26de0b7118e188bac5a30d9562418fa09be3826a':
  Update permission description string.
 2014-03-03 22:18:04 +00:00
Dirk Dougherty
26de0b7118 am cce121fb: Merge "Update permission description string." into klp-docs 
* commit 'cce121fb7504fbc460b85564735ff5d8a1ed4d55':
  Update permission description string.
 2014-03-03 22:13:31 +00:00
Dirk Dougherty
08d7c2861f Update permission description string. 
Change-Id: I6cd5895d78bff4f6f3fc8090e13a9ddbd83a1978
 2014-03-03 14:05:21 -08:00
Jay Shrauner
7e3efa82ec am 1f168fd4: am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev 
* commit '1f168fd43895e2a84c037df9f3ea54e36f5d0d16':
  Catch ActivityNotFoundException in quick contacts badge
 2014-03-03 22:02:14 +00:00
Jay Shrauner
1f168fd438 am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev 
* commit '4ef0aabe93877b7f30645b873fbc003651151f2f':
  Catch ActivityNotFoundException in quick contacts badge
 2014-03-03 21:58:47 +00:00
Jay Shrauner
4ef0aabe93 Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev 2014-03-03 21:56:18 +00:00