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

171968 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amit Mahajan
d9835f0c16 Change to treat slotId 0 emergency numbers as default. 
Emergency numbers are slot specific. This change is to read emergency
numbers for slotId 0 if slotId is unknown/invalid.

Bug: 18656027
Change-Id: Ibaeb720955f6abc421b84d3cb32eb812b6c55a34
 2014-12-15 10:38:27 -08:00
smain@google.com
c21b4553cb am 16d9a037: am 68e6819b: brute force improve suggestions for sdk download 
* commit '16d9a0378fb1c8fbefb263df2e3d627202ae677d':
  brute force improve suggestions for sdk download
 2014-12-15 18:19:05 +00:00
smain@google.com
16d9a0378f am 68e6819b: brute force improve suggestions for sdk download 
* commit '68e6819bd023d24894fc7cbb2357c685177d9b84':
  brute force improve suggestions for sdk download
 2014-12-15 18:10:45 +00:00
smain@google.com
68e6819bd0 brute force improve suggestions for sdk download 
Change-Id: I4698058a12472a65e67cadc3d0e3dd1ffed1b384
 2014-12-15 10:00:59 -08:00
Alan Viverette
878a5a6cd7 am 2f11125a: am 9973643b: Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev 
* commit '2f11125a7186cc65713804c939a0e538538d9f35':
  Give accessibility delegate the first pass at handling ACTION_CLICK
 2014-12-15 17:38:25 +00:00
Alan Viverette
37ea640fa9 am 2311ded6: am 2649c58b: Merge "Avoid self-recursion if client calls init() from date listener" into lmp-mr1-dev 
* commit '2311ded6a3da117aee221c0cf1168c24160d9041':
  Avoid self-recursion if client calls init() from date listener
 2014-12-15 17:38:19 +00:00
Alan Viverette
2f11125a71 am 9973643b: Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev 
* commit '9973643bfc123fcc73803542ef8cb74e243907ce':
  Give accessibility delegate the first pass at handling ACTION_CLICK
 2014-12-15 17:31:36 +00:00
Alan Viverette
2311ded6a3 am 2649c58b: Merge "Avoid self-recursion if client calls init() from date listener" into lmp-mr1-dev 
* commit '2649c58b460c2cd841173a8db513a54180422330':
  Avoid self-recursion if client calls init() from date listener
 2014-12-15 17:31:31 +00:00
Alan Viverette
9973643bfc Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev 2014-12-15 17:27:24 +00:00
Alan Viverette
2649c58b46 Merge "Avoid self-recursion if client calls init() from date listener" into lmp-mr1-dev 2014-12-15 17:26:39 +00:00
Christoph Studer
5c510ee551 Notification: Fix bigLargeIcon 
Fix a bug in L where BigPictureStyle.bigLargeIcon never made it
into the notification layout.

Bug: 18735551
Change-Id: Ia72d1de8cca2e95df3a99aaffeaba31325f1d858
 2014-12-15 17:00:14 +01:00
Geoff Mendal
7f2116d1db am 301a6176: (-s ours) am d6fc7cf1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '301a617698e74bb413df52f93ea7908a33423250':
  Import translations. DO NOT MERGE
 2014-12-15 15:25:44 +00:00
Geoff Mendal
301a617698 am d6fc7cf1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'd6fc7cf149795abdcd0629e229be52b816ee13c1':
  Import translations. DO NOT MERGE
 2014-12-15 15:17:58 +00:00
Geoff Mendal
ea96415646 am b73e02cf: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'b73e02cf5c736a944155b9d4586d8e8a6e40dc6e':
  Import translations. DO NOT MERGE
 2014-12-15 15:17:39 +00:00
Geoff Mendal
b73e02cf5c Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-15 15:11:25 +00:00
Geoff Mendal
d6fc7cf149 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-15 15:10:39 +00:00
Geoff Mendal
099cce32d2 Import translations. DO NOT MERGE 
Change-Id: I1631f2d7e5eca790da4ce7b78e90c626f96be23c
Auto-generated-cl: translation import
 2014-12-15 06:56:40 -08:00
Geoff Mendal
111a81669e Import translations. DO NOT MERGE 
Change-Id: I18accc4c251f9f5bbaa69512b317898637daed64
Auto-generated-cl: translation import
 2014-12-15 06:50:18 -08:00
Geoff Mendal
0736ee2631 am 0c8802bb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '0c8802bb3ee36247f92300a1bed2ead77c436479':
  Import translations. DO NOT MERGE
 2014-12-15 14:43:49 +00:00
Geoff Mendal
06b284f22b am b6a5dab3: (-s ours) am feb6c7f3: (-s ours) Import translations. DO NOT MERGE 
* commit 'b6a5dab3ed29c9c9bc864abff0e534641dcd4f32':
  Import translations. DO NOT MERGE
 2014-12-15 14:43:43 +00:00
Geoff Mendal
0c8802bb3e Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-15 14:39:49 +00:00
Geoff Mendal
b6a5dab3ed am feb6c7f3: (-s ours) Import translations. DO NOT MERGE 
* commit 'feb6c7f3d6d52648009ffb6fffa1f76d2f68fd21':
  Import translations. DO NOT MERGE
 2014-12-15 14:36:56 +00:00
Geoff Mendal
e184608398 Import translations. DO NOT MERGE 
Change-Id: Ifbbb87b8df40d269d7e28aa398dcacc878c93011
Auto-generated-cl: translation import
 2014-12-15 06:28:48 -08:00
Geoff Mendal
feb6c7f3d6 Import translations. DO NOT MERGE 
Change-Id: I70dc0646e4b8ea8b83dc1f7106067e278260bb3a
Auto-generated-cl: translation import
 2014-12-15 06:25:08 -08:00
Sarah Maddox
65dc25da3f docs: Updates lesson 1 of location API training: Get last-known location. 
Uses GoogleApiClient to connect to Play services.
Uses the latest Fused Location Provider API.
Updates the entire tutorial and code sample for clarity and correctness.

Bug: 17109822
Change-Id: I759a184a72d50702030b898a5f2e240cd3bdf4be
 2014-12-15 16:55:36 +11:00
Prem Kumar
da6ebb4ee2 am fa205fff: am 9ef07ad2: Merge "make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749" into lmp-mr1-dev 
* commit 'fa205ffff292bcbc1c504491b7ca2a5ee1b7b547':
  make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749
 2014-12-14 20:06:28 +00:00
Prem Kumar
3be9a9cefb am cb9379ca: am 6c2fa049: Merge "handle beacons reported with wrong RSSI value of 0 - Bug:18654243" into lmp-mr1-dev 
* commit 'cb9379ca774a503a9d33f3c0e8c5010495d2af58':
  handle beacons reported with wrong RSSI value of 0 - Bug:18654243
 2014-12-14 20:06:22 +00:00
Prem Kumar
fa205ffff2 am 9ef07ad2: Merge "make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749" into lmp-mr1-dev 
* commit '9ef07ad2b63edd4094bd8f15ccf861c7b014b2b0':
  make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749
 2014-12-14 19:59:40 +00:00
Prem Kumar
cb9379ca77 am 6c2fa049: Merge "handle beacons reported with wrong RSSI value of 0 - Bug:18654243" into lmp-mr1-dev 
* commit '6c2fa049aa342ed09c6987302d79a9447b99e5a4':
  handle beacons reported with wrong RSSI value of 0 - Bug:18654243
 2014-12-14 19:59:35 +00:00
Prem Kumar
9ef07ad2b6 Merge "make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749" into lmp-mr1-dev 2014-12-14 19:53:48 +00:00
Prem Kumar
6c2fa049aa Merge "handle beacons reported with wrong RSSI value of 0 - Bug:18654243" into lmp-mr1-dev 2014-12-14 19:52:40 +00:00
Guang Zhu
9954a44896 am d8ca1208: am 07bba9ab: Merge "shell based UI Automator source move" into lmp-mr1-dev 
* commit 'd8ca1208b3ee76e45e45e47d5806c398442a55a3':
  shell based UI Automator source move
 2014-12-14 04:04:26 +00:00
Guang Zhu
d8ca1208b3 am 07bba9ab: Merge "shell based UI Automator source move" into lmp-mr1-dev 
* commit '07bba9abeeba77cdf491ecc3047d1fa34f280bbb':
  shell based UI Automator source move
 2014-12-14 03:39:07 +00:00
Guang Zhu
07bba9abee Merge "shell based UI Automator source move" into lmp-mr1-dev 2014-12-14 03:30:57 +00:00
Jinsuk Kim
584c3dfb53 am d8858fa9: am a2bc055e: Merge "audioservice: Clear calling identity upon calling HdmiControlService" into lmp-mr1-dev 
* commit 'd8858fa91712b5e5d2a832e1993b6e265dafcf39':
  audioservice: Clear calling identity upon calling HdmiControlService
 2014-12-13 23:53:29 +00:00
Jinsuk Kim
d8858fa917 am a2bc055e: Merge "audioservice: Clear calling identity upon calling HdmiControlService" into lmp-mr1-dev 
* commit 'a2bc055eeb240c1787e7ad9755ffd4f106bdbb63':
  audioservice: Clear calling identity upon calling HdmiControlService
 2014-12-13 23:46:38 +00:00
Jinsuk Kim
a2bc055eeb Merge "audioservice: Clear calling identity upon calling HdmiControlService" into lmp-mr1-dev 2014-12-13 23:41:48 +00:00
Alan Jeon
f0e32ee572 Turn debug flag off 
Change-Id: Iced1a24ecfc182eccedd3a749fab9dd32dea41da
Signed-off-by: Alan Jeon <skyisle@gmail.com>
 2014-12-13 22:44:53 +09:00
Rich Slogar
b2a9bd5e9b am 895d1694: am 6b8756c3: docs: studio 1.0.1 revision update 
* commit '895d16945e97e108e33c614f87004c3f1efe5cb4':
  docs: studio 1.0.1 revision update
 2014-12-13 06:24:20 +00:00
Rich Slogar
895d16945e am 6b8756c3: docs: studio 1.0.1 revision update 
* commit '6b8756c39764b166c9f7d384e4542960dd8a7f98':
  docs: studio 1.0.1 revision update
 2014-12-13 06:17:00 +00:00
Rich Slogar
6b8756c397 docs: studio 1.0.1 revision update 
Change-Id: If9ef9ba986ae02463bec8040924a06ab0ccc8124
 2014-12-12 21:19:02 -08:00
Guang Zhu
18b892c723 shell based UI Automator source move 
frameworks/testing/uiautomator -> frameworks/base/cmds/uiautomator
  (samples, utils sub folders exlcuded)
frameworks/testing/uiautomator/utils -> frameworks/base/tests/utils

no source files changed, only one line makefile update (for
UI Automator API check)

Bug: 18708851
Change-Id: I396bd386d3d55a52df18af183685daf80caa9f73
 2014-12-12 17:31:38 -08:00
smain@google.com
63ed5e1b77 am 8bb3962b: am 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs 
* commit '8bb3962b2e58870efa01b2fc0fd8c2a620414974':
  fix distribute nav styles. they were not highlighted correctly.
 2014-12-13 01:12:37 +00:00
Christopher Tate
fe9e3195fa am 36ba3e47: am 90c0ae63: Merge "Check which file changed before requesting backup" into lmp-mr1-dev 
* commit '36ba3e478fbbb664a97b24723836444184c6943f':
  Check which file changed before requesting backup
 2014-12-13 01:09:03 +00:00
smain@google.com
8bb3962b2e am 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs 
* commit '8e8f29e34266b49d02f236367be98d6885f2f8a6':
  fix distribute nav styles. they were not highlighted correctly.
 2014-12-13 01:04:02 +00:00
Christopher Tate
36ba3e478f am 90c0ae63: Merge "Check which file changed before requesting backup" into lmp-mr1-dev 
* commit '90c0ae637ab84d1954ce972f55c5d3e2d2b20586':
  Check which file changed before requesting backup
 2014-12-13 00:59:10 +00:00
smain@google.com
8e8f29e342 Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs 2014-12-13 00:55:32 +00:00
Christopher Tate
90c0ae637a Merge "Check which file changed before requesting backup" into lmp-mr1-dev 2014-12-13 00:52:14 +00:00
Joe Fernandez
d799f75c6b am 4234fca6: am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs 
* commit '4234fca655819538fea60cafe2b8bf3e597fa3ea':
  docs: uiautomator blog link removal
 2014-12-13 00:34:20 +00:00
Joe Fernandez
4234fca655 am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs 
* commit '044f3947bc2e5e1beb2e46dd8e32822b57132b4a':
  docs: uiautomator blog link removal
 2014-12-13 00:25:14 +00:00