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

185007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
cb5ebc25fe am e0c0f6c2: (-s ours) am 9a036229: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit 'e0c0f6c2a8eae1004227f4d0a3d5f77730b29ff7':
  Import translations. DO NOT MERGE
 2015-03-16 13:03:56 +00:00
Geoff Mendal
e0c0f6c2a8 am 9a036229: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '9a036229277479c0bc53d850ed5c98b8b69aa080':
  Import translations. DO NOT MERGE
 2015-03-16 12:57:12 +00:00
Geoff Mendal
1dc1220679 am 51448a1a: (-s ours) am e35b3e38: (-s ours) Import translations. DO NOT MERGE 
* commit '51448a1a604ca7e4c8cedeb31d2907bcca524f6e':
  Import translations. DO NOT MERGE
 2015-03-16 12:56:32 +00:00
Geoff Mendal
9a03622927 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-03-16 12:49:40 +00:00
Geoff Mendal
51448a1a60 am e35b3e38: (-s ours) Import translations. DO NOT MERGE 
* commit 'e35b3e380f42f450ce0116b8ef83edb7d68584ef':
  Import translations. DO NOT MERGE
 2015-03-16 12:49:25 +00:00
Geoff Mendal
c6c9079a61 Import translations. DO NOT MERGE 
Change-Id: I50b5dec066f0ded04d173b768fe2285f9eebf81d
Auto-generated-cl: translation import
 2015-03-16 07:35:06 -05:00
Geoff Mendal
e35b3e380f Import translations. DO NOT MERGE 
Change-Id: I9f312c6b5a86264eb96437751fefd5957383b400
Auto-generated-cl: translation import
 2015-03-16 05:31:48 -07:00
Nicolas Prevot
8458e531bf Merge "Remove the owner userid of cross-profile intent filters." 2015-03-16 11:25:51 +00:00
Vinit Deshpande
4cd92835be Fixing build after merge from mirror-m-wireless-internal-release 
There have been few breaking changes

1. TelecomManager.getCallCapablePhoneAccounts is not hidden anymore
2. CAPABILITY_VIDEO_CALLING is not hidden anymore
3. mPhoneStateListener doesn't exist anymore, so it is commented out

Change-Id: I22221eda73a20c745e316d9d56f914ab17b83533
 2015-03-15 14:04:19 -07:00
Vinit Deshpande
ea76e49e6f am "am db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list. automerge: c984826" 
merged from goog/mirror-m-wireless-internal-release
1ef2b92 am db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list. automerge: c984826
 2015-03-15 13:44:36 -07:00
Vinit Deshpande
861ea44a62 am "am db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list." 
merged from goog/mirror-m-wireless-internal-release
c984826 am db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list.
 2015-03-15 13:44:35 -07:00
Vinit Deshpande
7b41c627a0 am "am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev automerge: 713e7cc" 
merged from goog/mirror-m-wireless-internal-release
fbabcb0 am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev automerge: 713e7cc
 2015-03-15 13:44:34 -07:00
Vinit Deshpande
468d549185 am "am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs automerge: 3a5a410" 
merged from goog/mirror-m-wireless-internal-release
d5e957c am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs automerge: 3a5a410
 2015-03-15 13:44:33 -07:00
Vinit Deshpande
66fd358cc8 am "am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev" 
merged from goog/mirror-m-wireless-internal-release
713e7cc am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev
 2015-03-15 13:44:32 -07:00
Vinit Deshpande
b721fdec2f am "am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev automerge: 5c69ca2" 
merged from goog/mirror-m-wireless-internal-release
2561d87 am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev automerge: 5c69ca2
 2015-03-15 13:44:31 -07:00
Vinit Deshpande
66ef27eb46 am "am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev automerge: 49d3c36" 
merged from goog/mirror-m-wireless-internal-release
ad04942 am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev automerge: 49d3c36
 2015-03-15 13:44:30 -07:00
Vinit Deshpande
48db44822c am "am 71518174: Merge "Fix project settings." into lmp-mr1-dev automerge: 4abf088" 
merged from goog/mirror-m-wireless-internal-release
746db9c am 71518174: Merge "Fix project settings." into lmp-mr1-dev automerge: 4abf088
 2015-03-15 13:44:29 -07:00
Vinit Deshpande
5f567df4d2 am "am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev automerge: 26f672a" 
merged from goog/mirror-m-wireless-internal-release
4f221f0 am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev automerge: 26f672a
 2015-03-15 13:44:28 -07:00
Vinit Deshpande
54fa5c0d5b am "am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs" 
merged from goog/mirror-m-wireless-internal-release
3a5a410 am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs
 2015-03-15 13:44:26 -07:00
Vinit Deshpande
8819022c82 am "am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev" 
merged from goog/mirror-m-wireless-internal-release
5c69ca2 am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
 2015-03-15 13:44:25 -07:00
Vinit Deshpande
d5b81ce280 am "am 77eb85e1: am c706a980: am a236a49e: am 47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs automerge: 766889e" 
merged from goog/mirror-m-wireless-internal-release
3be3344 am 77eb85e1: am c706a980: am a236a49e: am 47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs automerge: 766889e
 2015-03-15 13:44:24 -07:00
Vinit Deshpande
0acf1ffe68 am "am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev" 
merged from goog/mirror-m-wireless-internal-release
49d3c36 am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev
 2015-03-15 13:44:23 -07:00
Vinit Deshpande
7a5dcd62e7 am "am 71518174: Merge "Fix project settings." into lmp-mr1-dev" 
merged from goog/mirror-m-wireless-internal-release
4abf088 am 71518174: Merge "Fix project settings." into lmp-mr1-dev
 2015-03-15 13:44:22 -07:00
Vinit Deshpande
3a8960579c am "am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev" 
merged from goog/mirror-m-wireless-internal-release
26f672a am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev
 2015-03-15 13:44:21 -07:00
Vinit Deshpande
6b7a50b535 am "am 77eb85e1: am c706a980: am a236a49e: am 47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs" 
merged from goog/mirror-m-wireless-internal-release
766889e am 77eb85e1: am c706a980: am a236a49e: am 47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs
 2015-03-15 13:44:20 -07:00
Vinit Deshpande
522dbda5d4 am "Fix emergency callback number not shown for incoming calls." 
merged from goog/mirror-m-wireless-internal-release
068085b Fix emergency callback number not shown for incoming calls.
 2015-03-15 13:44:19 -07:00
Vinit Deshpande
e6501ab728 am "am dd7d025b: am ca0db1a0: am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs automerge: e32c162" 
merged from goog/mirror-m-wireless-internal-release
86d4da3 am dd7d025b: am ca0db1a0: am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs automerge: e32c162
 2015-03-15 13:44:17 -07:00
Vinit Deshpande
2edd0ca707 am "am dd7d025b: am ca0db1a0: am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs" 
merged from goog/mirror-m-wireless-internal-release
e32c162 am dd7d025b: am ca0db1a0: am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs
 2015-03-15 13:44:16 -07:00
Vinit Deshpande
ad2c40eb01 am "Merge "Indicate local and remote RX/TX capabilities for VT." into m-wireless-dev" 
merged from goog/mirror-m-wireless-internal-release
74050f5 Merge "Indicate local and remote RX/TX capabilities for VT." into m-wireless-dev
 2015-03-15 13:44:15 -07:00
Vinit Deshpande
ea49ffc54a am "am 50a9b835: am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs automerge: b0422a4" 
merged from goog/mirror-m-wireless-internal-release
52def6d am 50a9b835: am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs automerge: b0422a4
 2015-03-15 13:44:14 -07:00
Vinit Deshpande
4e0a066fef am "am 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs automerge: 709e9a8" 
merged from goog/mirror-m-wireless-internal-release
b55db05 am 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs automerge: 709e9a8
 2015-03-15 13:44:13 -07:00
Vinit Deshpande
78f4a93988 am "am a493c489: am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto" automerge: baf3451" 
merged from goog/mirror-m-wireless-internal-release
d9a99e0 am a493c489: am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto" automerge: baf3451
 2015-03-15 13:44:12 -07:00
Vinit Deshpande
50be7a2a75 am "am 50a9b835: am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs" 
merged from goog/mirror-m-wireless-internal-release
b0422a4 am 50a9b835: am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs
 2015-03-15 13:44:11 -07:00
Vinit Deshpande
a137ccf446 am "am 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs" 
merged from goog/mirror-m-wireless-internal-release
709e9a8 am 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs
 2015-03-15 13:44:10 -07:00
Vinit Deshpande
167c1ae570 am "am a493c489: am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"" 
merged from goog/mirror-m-wireless-internal-release
baf3451 am a493c489: am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"
 2015-03-15 13:44:09 -07:00
Vinit Deshpande
02ce8d8f33 am "Helper methods for voicemail status provider." 
merged from goog/mirror-m-wireless-internal-release
8b97ee3 Helper methods for voicemail status provider.
 2015-03-15 13:44:07 -07:00
Vinit Deshpande
386348f037 am "Indicate local and remote RX/TX capabilities for VT." 
merged from goog/mirror-m-wireless-internal-release
5e9e8bb Indicate local and remote RX/TX capabilities for VT.
 2015-03-15 13:44:05 -07:00
Vinit Deshpande
0a05c955be am "Merge "Add strings for IMS Registration error notifications." into lmp-mr1-wfc-dev automerge: 8b438c8" 
merged from goog/mirror-m-wireless-internal-release
4a2ca9d Merge "Add strings for IMS Registration error notifications." into lmp-mr1-wfc-dev automerge: 8b438c8
 2015-03-15 13:44:04 -07:00
Vinit Deshpande
c6c88559b7 am "Merge "Add strings for IMS Registration error notifications." into lmp-mr1-wfc-dev" 
merged from goog/mirror-m-wireless-internal-release
8b438c8 Merge "Add strings for IMS Registration error notifications." into lmp-mr1-wfc-dev
 2015-03-15 13:44:03 -07:00
Vinit Deshpande
54f833af66 am "Add missing system-api.txt for RTT API changes" 
merged from goog/mirror-m-wireless-internal-release
93e314e Add missing system-api.txt for RTT API changes
 2015-03-15 13:44:01 -07:00
Vinit Deshpande
75fe762af4 am "am 464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev automerge: 9462a93" 
merged from goog/mirror-m-wireless-internal-release
1123a3e am 464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev automerge: 9462a93
 2015-03-15 13:44:00 -07:00
Vinit Deshpande
34dbb09965 am "am 464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev" 
merged from goog/mirror-m-wireless-internal-release
9462a93 am 464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev
 2015-03-15 13:43:59 -07:00
Vinit Deshpande
74a7f97d01 am "Few changes to make API check happy [DO NOT MERGE]" 
merged from goog/mirror-m-wireless-internal-release with -s ours
No changes were actually committed
 2015-03-15 13:43:58 -07:00
Vinit Deshpande
7c3176c505 am "am "add 2 side RTT support on scan"" 
merged from goog/mirror-m-wireless-internal-release
0019e53 am "add 2 side RTT support on scan"
 2015-03-15 13:43:57 -07:00
Vinit Deshpande
5a6141f9ca am "am "Merge "Do not provide 5GHz option for softap if there is no country code available" into m-wireless-wifi-dev"" 
merged from goog/mirror-m-wireless-internal-release
bc93466 am "Merge "Do not provide 5GHz option for softap if there is no country code available" into m-wireless-wifi-dev"
 2015-03-15 13:43:55 -07:00
Vinit Deshpande
08524b7f71 am "am "Merge "Passpoint API - Take 1" into m-wireless-wifi-dev"" 
merged from goog/mirror-m-wireless-internal-release
4300ac4 am "Merge "Passpoint API - Take 1" into m-wireless-wifi-dev"
 2015-03-15 13:43:53 -07:00
Vinit Deshpande
bc4a627b4d am "am "Passpoint API - Take 1"" 
merged from goog/mirror-m-wireless-internal-release
d2585f3 am "Passpoint API - Take 1"
 2015-03-15 13:43:52 -07:00
Vinit Deshpande
c72607beca am "am "Do not provide 5GHz option for softap if there is no country code available"" 
merged from goog/mirror-m-wireless-internal-release
e959443 am "Do not provide 5GHz option for softap if there is no country code available"
 2015-03-15 13:43:50 -07:00
Vinit Deshpande
8fe414d3fc am "am "Introduce onLost event on bssid hotlist [DO NOT MERGE]"" 
merged from goog/mirror-m-wireless-internal-release with -s ours
No changes were actually committed
 2015-03-15 13:43:50 -07:00
Vinit Deshpande
ba8c391027 am "am "get channel list from driver for SoftAP channel selection"" 
merged from goog/mirror-m-wireless-internal-release
3cb5e4d am "get channel list from driver for SoftAP channel selection"
 2015-03-15 13:43:48 -07:00